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

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 60518 in the body.
You can then email your comments to 60518 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: guix-patches <at> gnu.org
Cc: ngraves <at> ngraves.fr
Subject: [PATCH] gnu: spirv-cross: Activate tests.
Date: Tue,  3 Jan 2023 16:48:20 +0100

* 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

Message #8 received at 60518 <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Nicolas Graves <ngraves <at> ngraves.fr>, 60518 <at> debbugs.gnu.org
Subject: Re: [PATCH] gnu: spirv-cross: Activate tests.
Date: Tue, 03 Jan 2023 20:51:54 +0100

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

Message #13 received at 60518-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Nicolas Graves <ngraves <at> ngraves.fr>
Cc: 60518-done <at> debbugs.gnu.org
Subject: Re: bug#60518: [PATCH] gnu: spirv-cross: Activate tests.
Date: Tue, 31 Jan 2023 23:57:03 +0100

Hi,

Nicolas Graves <ngraves <at> 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 <at> 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’.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.