From 8532564077dfe2fa56d8e0d0b39af8360a283dce Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Tue, 3 Jan 2023 16:48:20 +0100 Subject: gnu: spirv-cross: Activate tests. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/vulkan.scm (spirv-cross)[arguments]: Remove #:tests?. <#:phases>: Add ‘update-reference-shaders’. Signed-off-by: Ludovic Courtès --- gnu/packages/vulkan.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/gnu/packages/vulkan.scm b/gnu/packages/vulkan.scm index f5c619a2b2..a2db5511d5 100644 --- a/gnu/packages/vulkan.scm +++ b/gnu/packages/vulkan.scm @@ -120,11 +120,6 @@ parser,disassembler, validator, and optimizer for SPIR-V.") (arguments `(#:configure-flags (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 (modify-phases %standard-phases (add-after 'unpack 'fix-tests-to-find-deps @@ -134,8 +129,11 @@ parser,disassembler, validator, and optimizer for SPIR-V.") (string-append (assoc-ref inputs "glslang") "/bin"))) (substitute* "CMakeLists.txt" (("\\$\\{CMAKE_(.*)_DIR\\}/external/spirv-tools(.*)/bin") - (string-append (assoc-ref inputs "spirv-tools") "/bin"))) - #t))))) + (string-append (assoc-ref inputs "spirv-tools") "/bin"))))) + (add-before 'check 'update-reference-shaders + (lambda _ + (with-directory-excursion "../source" + (invoke "./update_test_shaders.sh"))))))) (inputs (list glslang spirv-headers spirv-tools)) (native-inputs (list python)) -- cgit 1.4.1