[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
11/50: gnu: icedtea-7: Run tests conditionally.
From: |
guix-commits |
Subject: |
11/50: gnu: icedtea-7: Run tests conditionally. |
Date: |
Thu, 23 Dec 2021 12:52:31 -0500 (EST) |
rekado pushed a commit to branch wip-java-bootstrap-simplify
in repository guix.
commit d23ef67194db87b597a8f642674a11ad8fdf6f6e
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Thu Dec 16 09:15:25 2021 +0100
gnu: icedtea-7: Run tests conditionally.
* gnu/packages/java.scm (icedtea-7)[arguments]: Respect TESTS? in 'check
phase.
---
gnu/packages/java.scm | 37 ++++++++++++++++++-------------------
1 file changed, 18 insertions(+), 19 deletions(-)
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index c1b3032..e2a26f2 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1618,30 +1618,29 @@ bootstrapping purposes.")
(("/bin/sh") (which "sh"))))
#t))
(replace 'check
- (lambda _
+ (lambda* (#:key tests? #:allow-other-keys)
;; The "make check-*" targets always return zero, so we need to
;; check for errors in the associated log files to determine
;; whether any tests have failed.
- (use-modules (ice-9 rdelim))
- (let* ((error-pattern (make-regexp "^(Error|FAILED):.*"))
- (checker (lambda (port)
- (let loop ()
- (let ((line (read-line port)))
- (cond
- ((eof-object? line) #t)
- ((regexp-exec error-pattern line)
- (error "test failed"))
- (else (loop)))))))
- (run-test (lambda (test)
- (invoke "make" test)
- (call-with-input-file
- (string-append "test/" test ".log")
- checker))))
- (when #f ; skip tests
+ (when tests?
+ (use-modules (ice-9 rdelim))
+ (let* ((error-pattern (make-regexp "^(Error|FAILED):.*"))
+ (checker (lambda (port)
+ (let loop ()
+ (let ((line (read-line port)))
+ (cond
+ ((eof-object? line) #t)
+ ((regexp-exec error-pattern line)
+ (error "test failed"))
+ (else (loop)))))))
+ (run-test (lambda (test)
+ (invoke "make" test)
+ (call-with-input-file
+ (string-append "test/" test ".log")
+ checker))))
(run-test "check-hotspot")
(run-test "check-langtools")
- (run-test "check-jdk"))
- #t)))
+ (run-test "check-jdk")))))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let ((doc (string-append (assoc-ref outputs "doc")
- 36/50: gnu: drip: Move it below the Java bootstrap packages., (continued)
- 36/50: gnu: drip: Move it below the Java bootstrap packages., guix-commits, 2021/12/23
- 33/50: gnu: ecj-bootstrap: Use label-less input style., guix-commits, 2021/12/23
- 49/50: gnu: axoloti-patcher-next: Remove trailing #T., guix-commits, 2021/12/23
- 27/50: gnu: ecj-javac-wrapper: Use G-Expression., guix-commits, 2021/12/23
- 40/50: gnu: java-kafka-clients: Use new input style., guix-commits, 2021/12/23
- 41/50: gnu: java-kafka-clients: Update to 1.1.1., guix-commits, 2021/12/23
- 44/50: gnu: java-mail: Use new input style., guix-commits, 2021/12/23
- 06/50: gnu: ecj-javac-wrapper-final: Use Guile 3., guix-commits, 2021/12/23
- 08/50: gnu: Add ecj4-bootstrap., guix-commits, 2021/12/23
- 10/50: gnu: Add jamvm-with-ecj4., guix-commits, 2021/12/23
- 11/50: gnu: icedtea-7: Run tests conditionally.,
guix-commits <=
- 13/50: gnu: icedtea-7: Bind INPUTS in 'patch-paths build phase., guix-commits, 2021/12/23
- 14/50: gnu: icedtea-7: Use system lcms and pcsc., guix-commits, 2021/12/23
- 26/50: gnu: ecj-bootstrap: Remove #:modules from arguments., guix-commits, 2021/12/23
- 32/50: gnu: ant-bootstrap: Use label-less input style., guix-commits, 2021/12/23
- 39/50: gnu: java-kafka-clients: Disable SSL test., guix-commits, 2021/12/23
- 31/50: gnu: jamvm-1-bootstrap: Use label-less input style., guix-commits, 2021/12/23
- 47/50: gnu: java-simple-xml: Disable one test., guix-commits, 2021/12/23
- 20/50: gnu: icedtea-8: Simplify source snippet., guix-commits, 2021/12/23
- 18/50: gnu: Remove icedtea-6., guix-commits, 2021/12/23
- 28/50: gnu: classpath-jamvm-wrappers: Use G-Expression., guix-commits, 2021/12/23