[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
11/21: gnu: shaderc: Enable (some) tests.
From: |
guix-commits |
Subject: |
11/21: gnu: shaderc: Enable (some) tests. |
Date: |
Fri, 22 May 2020 18:10:19 -0400 (EDT) |
mbakke pushed a commit to branch staging
in repository guix.
commit c904aa29356e5546d7941ef60bebfc4c09c75bb1
Author: Marius Bakke <address@hidden>
AuthorDate: Fri May 22 17:52:15 2020 +0200
gnu: shaderc: Enable (some) tests.
* gnu/packages/vulkan.scm (shaderc)[arguments]: Remove #:tests?. Add
substitution to use "spirv-dis" from inputs instead of bundled.
---
gnu/packages/vulkan.scm | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm
index a96b33c..59dbfae 100644
--- a/gnu/packages/vulkan.scm
+++ b/gnu/packages/vulkan.scm
@@ -266,7 +266,8 @@ API.")
"1kqqvsvib01bsmfbdy3fbwwpvkcdlfb6k71kjvzb3crql7w0rxff"))))
(build-system cmake-build-system)
(arguments
- `(#:tests? #f ; FIXME: Tests fail.
+ `(;; FIXME: Skip most of the tests, because enabling system gtest breaks
+ ;; the build: <https://github.com/google/shaderc/issues/470>.
#:configure-flags '("-DSHADERC_SKIP_TESTS=ON")
#:phases
(modify-phases %standard-phases
@@ -276,6 +277,10 @@ API.")
(("add_subdirectory\\(third_party\\)")
""))
+ (substitute* "glslc/test/CMakeLists.txt"
+ (("\\$<TARGET_FILE:spirv-dis>")
+ (which "spirv-dis")))
+
;; Do not attempt to use git to encode version information.
(substitute* "glslc/CMakeLists.txt"
(("add_dependencies\\(glslc_exe build-version\\)")
- branch staging updated (f510b56 -> 6fa1bad), guix-commits, 2020/05/22
- 01/21: gnu: spirv-headers: Update to 1.5.3., guix-commits, 2020/05/22
- 05/21: gnu: glslang: Build shared libraries., guix-commits, 2020/05/22
- 02/21: gnu: spirv-tools: Update to 2020.2., guix-commits, 2020/05/22
- 03/21: gnu: spirv-tools: Do not build static libraries., guix-commits, 2020/05/22
- 04/21: gnu: glslang: Update to 8.13.3743., guix-commits, 2020/05/22
- 06/21: gnu: vulkan-headers: Update to 1.2.141., guix-commits, 2020/05/22
- 07/21: gnu: vulkan-loader: Update to 1.2.140., guix-commits, 2020/05/22
- 09/21: gnu: vulkan-tools: Update to 1.2.140., guix-commits, 2020/05/22
- 11/21: gnu: shaderc: Enable (some) tests.,
guix-commits <=
- 10/21: gnu: shaderc: Update to 2020.0., guix-commits, 2020/05/22
- 12/21: gnu: Mesa: Install scripts to a separate output., guix-commits, 2020/05/22
- 17/21: gnu: vkd3d: Fix build with newer Vulkan headers., guix-commits, 2020/05/22
- 18/21: gnu: libdrm: Update to 2.4.101., guix-commits, 2020/05/22
- 13/21: gnu: Mesa: Remove unused input., guix-commits, 2020/05/22
- 14/21: gnu: Mesa: Remove obsolete phase., guix-commits, 2020/05/22
- 15/21: gnu: Mesa: Fix substitutions for absolute library references., guix-commits, 2020/05/22
- 16/21: gnu: vkquake: Fix build with newer Vulkan headers., guix-commits, 2020/05/22
- 20/21: gnu: mtxclient: Update to 0.3.0., guix-commits, 2020/05/22
- 08/21: gnu: vulkan-loader: Enable tests., guix-commits, 2020/05/22