diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-05-22 17:52:15 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-05-26 22:36:08 +0200 |
| commit | 18ac48364cb7e17da120b4b296aa06de5f159497 (patch) | |
| tree | cdc8948283e8f5698696a0514c8ffac66eea7bd5 | |
| parent | 4c5e45eb6bf1ad50ee2d0b5c854e81f6ce8de523 (diff) | |
| download | guix-18ac48364cb7e17da120b4b296aa06de5f159497.tar guix-18ac48364cb7e17da120b4b296aa06de5f159497.tar.gz | |
gnu: shaderc: Enable (some) tests.
* gnu/packages/vulkan.scm (shaderc)[arguments]: Remove #:tests?. Add
substitution to use "spirv-dis" from inputs instead of bundled.
| -rw-r--r-- | gnu/packages/vulkan.scm | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index a96b33c74f..59dbfae11d 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\\)") |