mbakke pushed a commit to branch staging
in repository guix.
commit c904aa29356e5546d7941ef60bebfc4c09c75bb1
Author: Marius Bakke <mba...@fastmail.com>
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\\)")
