[bug#60518] [PATCH] gnu: spirv-cross: Activate tests.

[bug#60518] [PATCH] gnu: spirv-cross: Activate tests.

[Nicolas Graves via Guix-patches via]

* gnu/packages/vulkan.scm (spirv-cross):
   [arguments]: Add phase update-reference-shaders.
   [arguments]: Activate tests.
---
 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 @@ (define-public spirv-cross
     (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 @@ (define-public spirv-cross
                 (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))
-- 
2.38.1

[bug#60518] [PATCH] gnu: spirv-cross: Activate tests.

[Liliana Marie Prikler]

Am Dienstag, dem 03.01.2023 um 16:48 +0100 schrieb Nicolas Graves:
> * gnu/packages/vulkan.scm (spirv-cross):
>    [arguments]: Add phase update-reference-shaders.
>    [arguments]: Activate tests.
Should be 
  
  * gnu/packages/vulkan.scm (spirv-cross)[arguments]: Remove #:tests?.
  <#:phases>: Add ‘update-reference-shaders’.

without the leading indentation.

> ---
>  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 @@ (define-public spirv-cross
>      (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 @@ (define-public spirv-cross
>                  (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
Possibly rename to ‘fix-failing-tests’.
> +           (lambda _
> +             (with-directory-excursion "../source"
> +               (invoke "./update_test_shaders.sh")))))))
Instead of updating all the shaders, should we perhaps only update 

the three that are mentioned as failing?

Cheers

bug#60518: [PATCH] gnu: spirv-cross: Activate tests.

[Ludovic Courtès]

Hi,

Nicolas Graves <ngraves@ngraves.fr> skribis:

> * gnu/packages/vulkan.scm (spirv-cross):
>    [arguments]: Add phase update-reference-shaders.
>    [arguments]: Activate tests.

Applied, thanks!

Liliana Marie Prikler <liliana.prikler@gmail.com> skribis:

> Am Dienstag, dem 03.01.2023 um 16:48 +0100 schrieb Nicolas Graves:
>> * gnu/packages/vulkan.scm (spirv-cross):
>>    [arguments]: Add phase update-reference-shaders.
>>    [arguments]: Activate tests.
> Should be 
>   
>   * gnu/packages/vulkan.scm (spirv-cross)[arguments]: Remove #:tests?.
>   <#:phases>: Add ‘update-reference-shaders’.

I did that on their behalf (in general I think that’s what we should do,
it’s just more efficient and less frustrating for everyone).

>> +           (lambda _
>> +             (with-directory-excursion "../source"
>> +               (invoke "./update_test_shaders.sh")))))))
> Instead of updating all the shaders, should we perhaps only update 
>
> the three that are mentioned as failing?

Apparently the script is designed for this purpose.

Thanks,
Ludo’.