diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-10-17 20:47:11 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-10-17 20:47:11 +0200 |
| commit | d02bb02f7d833ad371c53c346b6cb77f01377cf4 (patch) | |
| tree | 9506f04a7fde2f3b264ba1d2a9012085e1f72b72 /build-aux | |
| parent | fb3ff265cd8c6b4c6160f94240dc8932097e637b (diff) | |
| parent | acce0a474c1493ab18912bc46285248e4ccb0314 (diff) | |
| download | guix-d02bb02f7d833ad371c53c346b6cb77f01377cf4.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'build-aux')
| -rw-r--r-- | build-aux/run-system-tests.scm | 49 |
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))))))))) |