guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

07/07: gnu: spirv-cross: Activate tests.


From: guix-commits
Subject: 07/07: gnu: spirv-cross: Activate tests.
Date: Tue, 31 Jan 2023 17:58:13 -0500 (EST)

civodul pushed a commit to branch master
in repository guix.

commit 8532564077dfe2fa56d8e0d0b39af8360a283dce
Author: Nicolas Graves <ngraves@ngraves.fr>
AuthorDate: Tue Jan 3 16:48:20 2023 +0100

    gnu: spirv-cross: Activate tests.
    
    * gnu/packages/vulkan.scm (spirv-cross)[arguments]: Remove #:tests?.
    <#:phases>: Add ‘update-reference-shaders’.
    
    Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 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))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]