From 214f27145ea93dcab99929586df3259acf77d7c9 Mon Sep 17 00:00:00 2001 From: Ekaitz Zarraga Date: Thu, 25 Jul 2024 21:43:44 +0200 Subject: Fix zig-0.13.0 testing --- zig.scm | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/zig.scm b/zig.scm index c956bcf..b3c009f 100644 --- a/zig.scm +++ b/zig.scm @@ -8,6 +8,7 @@ #:use-module (guix build utils) #:use-module (gnu packages) #:use-module (gnu packages compression) + #:use-module (gnu packages gcc) #:use-module (gnu packages llvm)) (define-public zig-0.11 @@ -128,9 +129,6 @@ toolchain. Among other features it provides "/lib/zig")) #:validate-runpath? #f ; TODO: zig binary can't find ld-linux. #:out-of-source? #f ; for tests - ;; Tests fails in: - ;; https://github.com/ziglang/zig/issues/18063 - #:tests? #f #:phases (modify-phases %standard-phases (add-after 'unpack 'set-env-variables @@ -151,14 +149,14 @@ toolchain. Among other features it provides (add-after 'install 'check (lambda* (#:key outputs tests? #:allow-other-keys) (when tests? + ;; Only run behavioral tests, no-cross (invoke (string-append (assoc-ref outputs "out") "/bin/zig") - "build" "test" - ;; We're not testing the compiler bootstrap chain. - ;; Non-native tests try to link and execute non-native - ;; binaries. - "-Dskip-non-native"))))))) + "test" + "-I" "test" + "test/behavior.zig"))))))) (inputs - (list clang-18 ; Clang propagates llvm. + (list (list gcc "lib") + clang-18 ; Clang propagates llvm. lld-18 zlib (list zstd "lib"))) -- cgit v1.2.3