[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
49/63: gnu: shaderc: Enable (some) tests.
From: |
guix-commits |
Subject: |
49/63: gnu: shaderc: Enable (some) tests. |
Date: |
Mon, 25 May 2020 15:15:29 -0400 (EDT) |
mbakke pushed a commit to branch staging2
in repository guix.
commit 1ea9092340bb0e02d637256d06c5cdba34cf61b6
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\\)")
- 60/63: gnu: mutter: Fix build with Mesa 20., (continued)
- 60/63: gnu: mutter: Fix build with Mesa 20., guix-commits, 2020/05/25
- 45/63: gnu: vulkan-loader: Update to 1.2.140., guix-commits, 2020/05/25
- 48/63: gnu: shaderc: Update to 2020.0., guix-commits, 2020/05/25
- 52/63: gnu: Mesa: Remove obsolete phase., guix-commits, 2020/05/25
- 23/63: gnu: python-requests: Update to 2.23.0., guix-commits, 2020/05/25
- 34/63: gnu: Mesa: Fix ineffective substitution on i686-linux., guix-commits, 2020/05/25
- 36/63: Merge branch 'master' into staging, guix-commits, 2020/05/25
- 39/63: gnu: spirv-headers: Update to 1.5.3., guix-commits, 2020/05/25
- 44/63: gnu: vulkan-headers: Update to 1.2.141., guix-commits, 2020/05/25
- 51/63: gnu: Mesa: Remove unused input., guix-commits, 2020/05/25
- 49/63: gnu: shaderc: Enable (some) tests.,
guix-commits <=
- 50/63: gnu: Mesa: Install scripts to a separate output., guix-commits, 2020/05/25
- 29/63: gnu: pcre2: Update to 10.35., guix-commits, 2020/05/25
- 53/63: gnu: Mesa: Fix substitutions for absolute library references., guix-commits, 2020/05/25
- 61/63: gnu: mesa-headers: Do not inherit outputs from Mesa., guix-commits, 2020/05/25
- 54/63: gnu: vkquake: Fix build with newer Vulkan headers., guix-commits, 2020/05/25
- 56/63: gnu: libdrm: Update to 2.4.101., guix-commits, 2020/05/25
- 62/63: gnu: qtwebengine: Fix build failure., guix-commits, 2020/05/25
- 43/63: gnu: glslang: Build shared libraries., guix-commits, 2020/05/25
- 47/63: gnu: vulkan-tools: Update to 1.2.140., guix-commits, 2020/05/25
- 55/63: gnu: vkd3d: Fix build with newer Vulkan headers., guix-commits, 2020/05/25