mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-18 12:47:33 -05:00
gnu: icedtea-7: Run tests conditionally.
* gnu/packages/java.scm (icedtea-7)[arguments]: Respect TESTS? in 'check phase.
This commit is contained in:
parent
35bac40a67
commit
9e6baab2d8
1 changed files with 18 additions and 19 deletions
|
@ -1618,10 +1618,11 @@ (define-public icedtea-7
|
||||||
(("/bin/sh") (which "sh"))))
|
(("/bin/sh") (which "sh"))))
|
||||||
#t))
|
#t))
|
||||||
(replace 'check
|
(replace 'check
|
||||||
(lambda _
|
(lambda* (#:key tests? #:allow-other-keys)
|
||||||
;; The "make check-*" targets always return zero, so we need to
|
;; The "make check-*" targets always return zero, so we need to
|
||||||
;; check for errors in the associated log files to determine
|
;; check for errors in the associated log files to determine
|
||||||
;; whether any tests have failed.
|
;; whether any tests have failed.
|
||||||
|
(when tests?
|
||||||
(use-modules (ice-9 rdelim))
|
(use-modules (ice-9 rdelim))
|
||||||
(let* ((error-pattern (make-regexp "^(Error|FAILED):.*"))
|
(let* ((error-pattern (make-regexp "^(Error|FAILED):.*"))
|
||||||
(checker (lambda (port)
|
(checker (lambda (port)
|
||||||
|
@ -1637,11 +1638,9 @@ (define-public icedtea-7
|
||||||
(call-with-input-file
|
(call-with-input-file
|
||||||
(string-append "test/" test ".log")
|
(string-append "test/" test ".log")
|
||||||
checker))))
|
checker))))
|
||||||
(when #f ; skip tests
|
|
||||||
(run-test "check-hotspot")
|
(run-test "check-hotspot")
|
||||||
(run-test "check-langtools")
|
(run-test "check-langtools")
|
||||||
(run-test "check-jdk"))
|
(run-test "check-jdk")))))
|
||||||
#t)))
|
|
||||||
(replace 'install
|
(replace 'install
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
(lambda* (#:key outputs #:allow-other-keys)
|
||||||
(let ((doc (string-append (assoc-ref outputs "doc")
|
(let ((doc (string-append (assoc-ref outputs "doc")
|
||||||
|
|
Loading…
Reference in a new issue