From: Nicolas Graves via Guix-patches via <guix-patches@gnu.org>
To: 60518@debbugs.gnu.org
Cc: ngraves@ngraves.fr
Subject: [bug#60518] [PATCH] gnu: spirv-cross: Activate tests.
Date: Tue, 3 Jan 2023 16:48:20 +0100 [thread overview]
Message-ID: <20230103154820.28860-1-ngraves@ngraves.fr> (raw)
* 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
next reply other threads:[~2023-01-03 15:49 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-03 15:48 Nicolas Graves via Guix-patches via [this message]
2023-01-03 19:51 ` [bug#60518] [PATCH] gnu: spirv-cross: Activate tests Liliana Marie Prikler
2023-01-31 22:57 ` bug#60518: " Ludovic Courtès
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230103154820.28860-1-ngraves@ngraves.fr \
--to=guix-patches@gnu.org \
--cc=60518@debbugs.gnu.org \
--cc=ngraves@ngraves.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).