ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 15:36:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: spirv-cross: Activate tests.

Browse source 
* gnu/packages/vulkan.scm (spirv-cross)[arguments]: Remove #:tests?.
<#:phases>: Add ‘update-reference-shaders’.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Nicolas Graves 2023-01-03 16:48:20 +01:00 committed by Ludovic Courtès
parent ae52644c7f
commit 8532564077
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gnu/packages/vulkan.scm
View file

@ -120,11 +120,6 @@ (define-public spirv-cross
(arguments (arguments
`(#:configure-flags `(#:configure-flags
(list "-DSPIRV_CROSS_SHARED=YES") (list "-DSPIRV_CROSS_SHARED=YES")
;; FIXME: The following tests fail:
;; 15 - spirv-cross-test-opt
;; 16 - spirv-cross-test-metal-opt
;; 17 - spirv-cross-test-hlsl-opt
#:tests? #f
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'fix-tests-to-find-deps (add-after 'unpack 'fix-tests-to-find-deps
@ -134,8 +129,11 @@ (define-public spirv-cross
(string-append (assoc-ref inputs "glslang") "/bin"))) (string-append (assoc-ref inputs "glslang") "/bin")))
(substitute* "CMakeLists.txt" (substitute* "CMakeLists.txt"
(("\\$\\{CMAKE_(.*)_DIR\\}/external/spirv-tools(.*)/bin") (("\\$\\{CMAKE_(.*)_DIR\\}/external/spirv-tools(.*)/bin")
(string-append (assoc-ref inputs "spirv-tools") "/bin"))) (string-append (assoc-ref inputs "spirv-tools") "/bin")))))
#t))))) (add-before 'check 'update-reference-shaders
(lambda _
(with-directory-excursion "../source"
(invoke "./update_test_shaders.sh")))))))
(inputs (inputs
(list glslang spirv-headers spirv-tools)) (list glslang spirv-headers spirv-tools))
(native-inputs (list python)) (native-inputs (list python))