futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: shaderc: Enable (some) tests.

Browse Source 
* gnu/packages/vulkan.scm (shaderc)[arguments]: Remove #:tests?.  Add
substitution to use "spirv-dis" from inputs instead of bundled.
This commit is contained in:
Marius Bakke 2020-05-22 17:52:15 +02:00 committed by Marius Bakke
parent 4c5e45eb6b
commit 18ac48364c
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gnu/packages/vulkan.scm
View File

@ -266,7 +266,8 @@ API.")
"1kqqvsvib01bsmfbdy3fbwwpvkcdlfb6k71kjvzb3crql7w0rxff")))) "1kqqvsvib01bsmfbdy3fbwwpvkcdlfb6k71kjvzb3crql7w0rxff"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (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") #:configure-flags '("-DSHADERC_SKIP_TESTS=ON")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
@ -276,6 +277,10 @@ API.")
(("add_subdirectory\\(third_party\\)") (("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. ;; Do not attempt to use git to encode version information.
(substitute* "glslc/CMakeLists.txt" (substitute* "glslc/CMakeLists.txt"
(("add_dependencies\\(glslc_exe build-version\\)") (("add_dependencies\\(glslc_exe build-version\\)")