guix-patches
[Top][All Lists]
Advanced

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

[bug#30601] [PATCH staging] gnu: ninja: Disable tests on armhf.


From: Marius Bakke
Subject: [bug#30601] [PATCH staging] gnu: ninja: Disable tests on armhf.
Date: Sun, 25 Feb 2018 04:54:38 +0100

* gnu/packages/ninja.scm (ninja)[arguments]: Set #:tests? #f on armhf.  Adjust
CHECK-PHASE accordingly.
---
 gnu/packages/ninja.scm | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/ninja.scm b/gnu/packages/ninja.scm
index adb236484..cff2ac38b 100644
--- a/gnu/packages/ninja.scm
+++ b/gnu/packages/ninja.scm
@@ -42,7 +42,15 @@
     (build-system gnu-build-system)
     (native-inputs `(("python" ,python-2)))
     (arguments
-     '(#:phases
+     ;; FIXME: On armhf-linux, Subprocess.TestWithLots fails like this:
+     ;;   *** Failure in src/subprocess_test.cc:241
+     ;;   ExitSuccess == procs[i]->Finish()
+     ;; See <https://hydra.gnu.org/build/2515522/nixlog/1/raw>.
+     ;; Disable for now.
+     `(#:tests? (let ((system ,(or (%current-target-system)
+                                   (%current-system))))
+                  (not (string-prefix? "arm" system)))
+       #:phases
        (modify-phases %standard-phases
          (replace 'configure
            (lambda _
@@ -53,10 +61,12 @@
            (lambda _
              (invoke "./configure.py" "--bootstrap")))
          (replace 'check
-           (lambda _
-             (invoke "./configure.py")
-             (invoke "./ninja" "ninja_test")
-             (invoke "./ninja_test")))
+           (lambda* (#:key tests? #:allow-other-keys)
+             (if tests?
+                 (and (invoke "./configure.py")
+                      (invoke "./ninja" "ninja_test")
+                      (invoke "./ninja_test"))
+                 (display "test suite not run\n"))))
          (replace 'install
            (lambda* (#:key outputs #:allow-other-keys)
              (let* ((out (assoc-ref outputs "out"))
-- 
2.16.2






reply via email to

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