aboutsummaryrefslogtreecommitdiff
path: root/build-aux
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2018-10-09 09:24:24 +0200
committerLudovic Courtès <ludo@gnu.org>2018-10-09 18:54:12 +0200
commit276f368051ff52cf202ede9fce579e49d9d744ec (patch)
treeb64ab1802ad3096fb05a8d7ea5f92b883470bd0c /build-aux
parent1fe57b3746de17c523a01e6c3e5a29bde5843018 (diff)
downloadguix-276f368051ff52cf202ede9fce579e49d9d744ec.tar
guix-276f368051ff52cf202ede9fce579e49d9d744ec.tar.gz
tests: "make check-system" produces colored output.
* build-aux/run-system-tests.scm (run-system-tests): Use 'with-status-report'.
Diffstat (limited to 'build-aux')
-rw-r--r--build-aux/run-system-tests.scm49
1 files changed, 26 insertions, 23 deletions
diff --git a/build-aux/run-system-tests.scm b/build-aux/run-system-tests.scm
index 8b44f579a2..953ba3e221 100644
--- a/build-aux/run-system-tests.scm
+++ b/build-aux/run-system-tests.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2016 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2016, 2018 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -19,6 +19,7 @@
(define-module (run-system-tests)
#:use-module (gnu tests)
#:use-module (guix store)
+ #:use-module (guix status)
#:use-module (guix monads)
#:use-module (guix derivations)
#:use-module (guix ui)
@@ -63,25 +64,27 @@
(length tests))
(with-store store
- (run-with-store store
- (mlet* %store-monad ((drv (mapm %store-monad system-test-value tests))
- (out -> (map derivation->output-path drv)))
- (mbegin %store-monad
- (show-what-to-build* drv)
- (set-build-options* #:keep-going? #t #:keep-failed? #t
- #:print-build-trace #t
- #:fallback? #t)
- (built-derivations* drv)
- (mlet %store-monad ((valid (filterm (store-lift valid-path?)
- out))
- (failed (filterm (store-lift
- (negate valid-path?))
- out)))
- (format #t "TOTAL: ~a\n" (length drv))
- (for-each (lambda (item)
- (format #t "PASS: ~a~%" item))
- valid)
- (for-each (lambda (item)
- (format #t "FAIL: ~a~%" item))
- failed)
- (exit (null? failed))))))))
+ (with-status-report print-build-event
+ (run-with-store store
+ (mlet* %store-monad ((drv (mapm %store-monad system-test-value tests))
+ (out -> (map derivation->output-path drv)))
+ (mbegin %store-monad
+ (show-what-to-build* drv)
+ (set-build-options* #:keep-going? #t #:keep-failed? #t
+ #:print-build-trace #t
+ #:print-extended-build-trace? #t
+ #:fallback? #t)
+ (built-derivations* drv)
+ (mlet %store-monad ((valid (filterm (store-lift valid-path?)
+ out))
+ (failed (filterm (store-lift
+ (negate valid-path?))
+ out)))
+ (format #t "TOTAL: ~a\n" (length drv))
+ (for-each (lambda (item)
+ (format #t "PASS: ~a~%" item))
+ valid)
+ (for-each (lambda (item)
+ (format #t "FAIL: ~a~%" item))
+ failed)
+ (exit (null? failed)))))))))