diff options
49 files changed, 211 insertions, 146 deletions
diff --git a/Makefile.am b/Makefile.am index 06700def93..4b665a628a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -293,10 +293,11 @@ endif BUILD_DAEMON TESTS = $(SCM_TESTS) $(SH_TESTS) -AM_TESTS_ENVIRONMENT = abs_top_srcdir="$(abs_top_srcdir)" +AM_TESTS_ENVIRONMENT = abs_top_srcdir="$(abs_top_srcdir)" GUILE_AUTO_COMPILE=0 -SCM_LOG_COMPILER = $(top_builddir)/test-env $(GUILE) -AM_SCM_LOG_FLAGS = --no-auto-compile -L "$(top_srcdir)" +SCM_LOG_DRIVER = $(top_builddir)/test-env $(GUILE) --no-auto-compile \ + -e main $(top_srcdir)/build-aux/test-driver.scm +AM_SCM_LOG_DRIVER_FLAGS = --brief=yes SH_LOG_COMPILER = $(top_builddir)/test-env $(SHELL) AM_SH_LOG_FLAGS = -x -e diff --git a/build-aux/test-driver.scm b/build-aux/test-driver.scm new file mode 100644 index 0000000000..e9cc2cb24c --- /dev/null +++ b/build-aux/test-driver.scm @@ -0,0 +1,189 @@ +;;;; test-driver.scm - Guile test driver for Automake testsuite harness + +(define script-version "2016-04-03.12") ;UTC + +;;; Copyright © 2015, 2016 Mathieu Lirzin <mthl@gnu.org> +;;; +;;; This program is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; This program is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with this program. If not, see <http://www.gnu.org/licenses/>. + +;;;; Commentary: +;;; +;;; This script provides a Guile test driver using the SRFI-64 Scheme API for +;;; test suites. SRFI-64 is distributed with Guile since version 2.0.9. +;;; +;;;; Code: + +(use-modules (ice-9 getopt-long) + (ice-9 pretty-print) + (srfi srfi-26) + (srfi srfi-64)) + +(define (show-help) + (display "Usage: + test-driver --test-name=NAME --log-file=PATH --trs-file=PATH + [--expect-failure={yes|no}] [--color-tests={yes|no}] + [--enable-hard-errors={yes|no}] [--brief={yes|no}}] [--] + TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS] +The '--test-name', '--log-file' and '--trs-file' options are mandatory.\n")) + +(define %options + '((test-name (value #t)) + (log-file (value #t)) + (trs-file (value #t)) + (color-tests (value #t)) + (expect-failure (value #t)) ;XXX: not implemented yet + (enable-hard-errors (value #t)) ;not implemented in SRFI-64 + (brief (value #t)) + (help (single-char #\h) (value #f)) + (version (single-char #\V) (value #f)))) + +(define (option->boolean options key) + "Return #t if the value associated with KEY in OPTIONS is \"yes\"." + (and=> (option-ref options key #f) (cut string=? <> "yes"))) + +(define* (test-display field value #:optional (port (current-output-port)) + #:key pretty?) + "Display \"FIELD: VALUE\\n\" on PORT." + (if pretty? + (begin + (format port "~A:~%" field) + (pretty-print value port #:per-line-prefix "+ ")) + (format port "~A: ~A~%" field value))) + +(define* (result->string symbol #:key colorize?) + "Return SYMBOL as an upper case string. Use colors when COLORIZE is #t." + (let ((result (string-upcase (symbol->string symbol)))) + (if colorize? + (string-append (case symbol + ((pass) "[0;32m") ;green + ((xfail) "[1;32m") ;light green + ((skip) "[1;34m") ;blue + ((fail xpass) "[0;31m") ;red + ((error) "[0;35m")) ;magenta + result + "[m") ;no color + result))) + +(define* (test-runner-gnu test-name #:key color? brief? out-port trs-port) + "Return an custom SRFI-64 test runner. TEST-NAME is a string specifying the +file name of the current the test. COLOR? specifies whether to use colors, +and BRIEF?, well, you know. OUT-PORT and TRS-PORT must be output ports. The +current output port is supposed to be redirected to a '.log' file." + + (define (test-on-test-begin-gnu runner) + ;; Procedure called at the start of an individual test case, before the + ;; test expression (and expected value) are evaluated. + (let ((result (cute assq-ref (test-result-alist runner) <>))) + (test-display "test-name" (result 'test-name)) + (test-display "location" + (string-append (result 'source-file) ":" + (number->string (result 'source-line)))) + (test-display "source" (result 'source-form) #:pretty? #t))) + + (define (test-on-test-end-gnu runner) + ;; Procedure called at the end of an individual test case, when the result + ;; of the test is available. + (let* ((results (test-result-alist runner)) + (result? (cut assq <> results)) + (result (cut assq-ref results <>))) + (unless brief? + ;; Display the result of each test case on the console. + (test-display + (result->string (test-result-kind runner) #:colorize? color?) + (string-append test-name " - " (test-runner-test-name runner)) + out-port)) + (when (result? 'expected-value) + (test-display "expected-value" (result 'expected-value))) + (when (result? 'expected-error) + (test-display "expected-error" (result 'expected-error) #:pretty? #t)) + (when (result? 'actual-value) + (test-display "actual-value" (result 'actual-value))) + (when (result? 'actual-error) + (test-display "actual-error" (result 'actual-error) #:pretty? #t)) + (test-display "result" (result->string (result 'result-kind))) + (newline) + (test-display ":test-result" + (string-append (result->string (test-result-kind runner)) + " " (test-runner-test-name runner)) + trs-port))) + + (define (test-on-group-end-gnu runner) + ;; Procedure called by a 'test-end', including at the end of a test-group. + (let ((fail (or (positive? (test-runner-fail-count runner)) + (positive? (test-runner-xpass-count runner)))) + (skip (or (positive? (test-runner-skip-count runner)) + (positive? (test-runner-xfail-count runner))))) + ;; XXX: The global results need some refinements for XPASS. + (test-display ":global-test-result" + (if fail "FAIL" (if skip "SKIP" "PASS")) + trs-port) + (test-display ":recheck" + (if fail "yes" "no") + trs-port) + (test-display ":copy-in-global-log" + (if (or fail skip) "yes" "no") + trs-port) + (when brief? + ;; Display the global test group result on the console. + (test-display (result->string (if fail 'fail (if skip 'skip 'pass)) + #:colorize? color?) + test-name + out-port)) + #f)) + + (let ((runner (test-runner-null))) + (test-runner-on-test-begin! runner test-on-test-begin-gnu) + (test-runner-on-test-end! runner test-on-test-end-gnu) + (test-runner-on-group-end! runner test-on-group-end-gnu) + (test-runner-on-bad-end-name! runner test-on-bad-end-name-simple) + runner)) + + +;;; +;;; Entry point. +;;; + +(define (main . args) + (let* ((opts (getopt-long (command-line) %options)) + (option (cut option-ref opts <> <>))) + (cond + ((option 'help #f) (show-help)) + ((option 'version #f) (format #t "test-driver.scm ~A" script-version)) + (else + (let ((log (open-file (option 'log-file "") "w0")) + (trs (open-file (option 'trs-file "") "wl")) + (out (duplicate-port (current-output-port) "wl"))) + (redirect-port log (current-output-port)) + (redirect-port log (current-warning-port)) + (redirect-port log (current-error-port)) + (test-with-runner + (test-runner-gnu (option 'test-name #f) + #:color? (option->boolean opts 'color-tests) + #:brief? (option->boolean opts 'brief) + #:out-port out #:trs-port trs) + (load-from-path (option 'test-name #f))) + (close-port log) + (close-port trs) + (close-port out)))) + (exit 0))) + +;;; Local Variables: +;;; eval: (add-hook 'write-file-functions 'time-stamp) +;;; time-stamp-start: "(define script-version \"" +;;; time-stamp-format: "%:y-%02m-%02d.%02H" +;;; time-stamp-time-zone: "UTC" +;;; time-stamp-end: "\") ;UTC" +;;; End: + +;;;; test-driver.scm ends here. diff --git a/doc/guix.texi b/doc/guix.texi index c5b13e0572..a34d547f7c 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -596,12 +596,18 @@ It is also possible to run a subset of the tests by defining the make check TESTS="tests/store.scm tests/cpio.scm" @end example +By default, tests results are displayed at a file level. In order to +see the details of every individual test cases, it is possible to define +the @code{SCM_LOG_DRIVER_FLAGS} makefile variable as in this example: + +@example +make check TESTS="tests/base64.scm" SCM_LOG_DRIVER_FLAGS="--brief=no" +@end example + Upon failure, please email @email{bug-guix@@gnu.org} and attach the -@file{test-suite.log} file. When @file{tests/@var{something}.scm} -fails, please also attach the @file{@var{something}.log} file available -in the top-level build directory. Please specify the Guix version being -used as well as version numbers of the dependencies -(@pxref{Requirements}) in your message. +@file{test-suite.log} file. Please specify the Guix version being used +as well as version numbers of the dependencies (@pxref{Requirements}) in +your message. @node Setting Up the Daemon @section Setting Up the Daemon diff --git a/test-env.in b/test-env.in index 799a62276f..c3f60f7283 100644 --- a/test-env.in +++ b/test-env.in @@ -31,6 +31,10 @@ unset CDPATH if [ -x "@abs_top_builddir@/guix-daemon" ] then + # Silence the daemon's output, which is often useless, as well as that of + # Bash (such as "Terminated" messages when 'guix-daemon' is killed.) + exec 2> /dev/null + NIX_STORE_DIR="@GUIX_TEST_ROOT@/store" # Do that because store.scm calls `canonicalize-path' on it. diff --git a/tests/base32.scm b/tests/base32.scm index dcd926f4b8..194f8da96b 100644 --- a/tests/base32.scm +++ b/tests/base32.scm @@ -101,6 +101,3 @@ l)))) (test-end) - - -(exit (= (test-runner-fail-count (test-runner-current)) 0)) diff --git a/tests/build-utils.scm b/tests/build-utils.scm index b0a4d1584a..cc96738e36 100644 --- a/tests/build-utils.scm +++ b/tests/build-utils.scm @@ -141,6 +141,3 @@ (equal? str "hello world\n"))))) (test-end) - - -(exit (= (test-runner-fail-count (test-runner-current)) 0)) diff --git a/tests/builders.scm b/tests/builders.scm index a7c3e42830..bb9e0fa85b 100644 --- a/tests/builders.scm +++ b/tests/builders.scm @@ -113,6 +113,3 @@ (file-exists? (string-append out "/bin/hello"))))) (test-end "builders") - - -(exit (= (test-runner-fail-count (test-runner-current)) 0)) diff --git a/tests/challenge.scm b/tests/challenge.scm index e53cacd333..9505042a45 100644 --- a/tests/challenge.scm +++ b/tests/challenge.scm @@ -106,9 +106,6 @@ (test-end) - -(exit (= (test-runner-fail-count (test-runner-current)) 0)) - ;;; Local Variables: ;;; eval: (put 'with-derivation-narinfo* 'scheme-indent-function 2) ;;; End: diff --git a/tests/containers.scm b/tests/containers.scm index 12982a64f7..c11cdd1ce5 100644 --- a/tests/containers.scm +++ b/tests/containers.scm @@ -26,14 +26,14 @@ (define (assert-exit x) (primitive-exit (if x 0 1))) +(test-begin "containers") + ;; Skip these tests unless user namespaces are available and the setgroups ;; file (introduced in Linux 3.19 to address a security issue) exists. (unless (and (user-namespace-supported?) (unprivileged-user-namespace-supported?) (setgroups-supported?)) - (exit 77)) - -(test-begin "containers") + (test-skip 7)) (test-assert "call-with-container, exit with 0 when there is no error" (zero? @@ -142,6 +142,3 @@ (zero? result))))))) (test-end) - - -(exit (= (test-runner-fail-count (test-runner-current)) 0)) diff --git a/tests/cpan.scm b/tests/cpan.scm index 583684104d..5d56f0bd2b 100644 --- a/tests/cpan.scm +++ b/tests/cpan.scm @@ -98,6 +98,3 @@ (pk 'fail x #f))))) (test-end "cpan") - - -(exit (= (test-runner-fail-count (test-runner-current)) 0)) diff --git a/tests/cpio.scm b/tests/cpio.scm index cf65f9808d..516de0655b 100644 --- a/tests/cpio.scm +++ b/tests/cpio.scm @@ -79,6 +79,3 @@ (stat:size (stat file)))))))))))))) (test-end "cpio") - - -(exit (= (test-runner-fail-count (test-runner-current)) 0)) diff --git a/tests/cran.scm b/tests/cran.scm index 83d2e7f554..896c5af06c 100644 --- a/tests/cran.scm +++ b/tests/cran.scm @@ -131,6 +131,3 @@ lines. And: this line continues the description.") (pk 'fail x #f)))))) (test-end "cran") - - -(exit (= (test-runner-fail-count (test-runner-current)) 0)) diff --git a/tests/cve.scm b/tests/cve.scm index 26bc560e52..26e710ce70 100644 --- a/tests/cve.scm +++ b/tests/cve.scm @@ -64,6 +64,3 @@ (lookup "openoffice.org" "2.3.0")))) (test-end "cve") - - -(exit (= (test-runner-fail-count (test-runner-current)) 0)) diff --git a/tests/derivations.scm b/tests/derivations.scm index a52142e0f1..cb7196e2a9 100644 --- a/tests/derivations.scm +++ b/tests/derivations.scm @@ -1008,6 +1008,3 @@ (call-with-input-file out get-string-all)))) (test-end) - - -(exit (= (test-runner-fail-count (test-runner-current)) 0)) diff --git a/tests/elpa.scm b/tests/elpa.scm index e8adde3f07..46c6ac2d75 100644 --- a/tests/elpa.scm +++ b/tests/elpa.scm @@ -104,6 +104,3 @@ information about package NAME. (Function 'elpa-package-info'.)" (eval-test-with-elpa "auctex")) (test-end "elpa") - - -(exit (= (test-runner-fail-count (test-runner-current)) 0)) diff --git a/tests/file-systems.scm b/tests/file-systems.scm index c36509b2b0..aed27e89c2 100644 --- a/tests/file-systems.scm +++ b/tests/file-systems.scm @@ -51,6 +51,3 @@ (equal? form '(uuid "foobar")))))) (test-end) - - -(exit (= (test-runner-fail-count (test-runner-current)) 0)) diff --git a/tests/gem.scm b/tests/gem.scm index ebce809840..0b37c70142 100644 --- a/tests/gem.scm +++ b/tests/gem.scm @@ -77,6 +77,3 @@ (pk 'fail x #f))))) (test-end "gem") - - -(exit (= (test-runner-fail-count (test-runner-current)) 0)) diff --git a/tests/gexp.scm b/tests/gexp.scm index 75b907abee..db0ffd2fdd 100644 --- a/tests/gexp.scm +++ b/tests/gexp.scm @@ -784,9 +784,6 @@ (test-end "gexp") - -(exit (= (test-runner-fail-count (test-runner-current)) 0)) - ;; Local Variables: ;; eval: (put 'test-assertm 'scheme-indent-function 1) ;; End: diff --git a/tests/gnu-maintenance.scm b/tests/gnu-maintenance.scm index e7296137dc..4f2f1ae943 100644 --- a/tests/gnu-maintenance.scm +++ b/tests/gnu-maintenance.scm @@ -39,6 +39,3 @@ ("gnutls" "gnutls-3.2.18-w32.zip"))))) (test-end) - - -(exit (= (test-runner-fail-count (test-runner-current)) 0)) diff --git a/tests/grafts.scm b/tests/grafts.scm index 4bc33709d6..afed704cde 100644 --- a/tests/grafts.scm +++ b/tests/grafts.scm @@ -159,6 +159,3 @@ (string=? (readlink two) one)))))) (test-end) - - -(exit (= (test-runner-fail-count (test-runner-current)) 0)) diff --git a/tests/graph.scm b/tests/graph.scm index 4205b9b8c7..32317195d7 100644 --- a/tests/graph.scm +++ b/tests/graph.scm @@ -276,6 +276,3 @@ edges." (list p1a p1b p0))))))) (test-end "graph") - - -(exit (= (test-runner-fail-count (test-runner-current)) 0)) diff --git a/tests/gremlin.scm b/tests/gremlin.scm index dc9f78c21a..2885554967 100644 --- a/tests/gremlin.scm +++ b/tests/gremlin.scm @@ -64,6 +64,3 @@ "ORIGIN/foo"))) (test-end "gremlin") - - -(exit (= (test-runner-fail-count (test-runner-current)) 0)) diff --git a/tests/hackage.scm b/tests/hackage.scm index b608ccd866..d1ebe37405 100644 --- a/tests/hackage.scm +++ b/tests/hackage.scm @@ -160,6 +160,3 @@ library (x (pk 'fail x #f)))) (test-end "hackage") - - -(exit (= (test-runner-fail-count (test-runner-current)) 0)) diff --git a/tests/hash.scm b/tests/hash.scm index 9bcd69440b..8039549971 100644 --- a/tests/hash.scm +++ b/tests/hash.scm @@ -126,6 +126,3 @@ In Guile <= 2.0.9, CBIPs were always fully buffered, so the (list hello hash world)))) (test-end) - - -(exit (= (test-runner-fail-count (test-runner-current)) 0)) diff --git a/tests/import-utils.scm b/tests/import-utils.scm index 08365816d4..3b11875c4a 100644 --- a/tests/import-utils.scm +++ b/tests/import-utils.scm @@ -34,6 +34,3 @@ (beautify-description "A function to establish world peace")) (test-end "import-utils") - - -(exit (= (test-runner-fail-count (test-runner-current)) 0)) diff --git a/tests/lint.scm b/tests/lint.scm index 54be50d1c1..4f0196491d 100644 --- a/tests/lint.scm +++ b/tests/lint.scm @@ -581,9 +581,6 @@ requests." (test-end "lint") - -(exit (= (test-runner-fail-count (test-runner-current)) 0)) - ;; Local Variables: ;; eval: (put 'with-http-server 'scheme-indent-function 1) ;; eval: (put 'with-warnings 'scheme-indent-function 0) diff --git a/tests/monads.scm b/tests/monads.scm index 4112bcb6cf..18bf4119be 100644 --- a/tests/monads.scm +++ b/tests/monads.scm @@ -258,6 +258,3 @@ '()))) (test-end "monads") - - -(exit (= (test-runner-fail-count (test-runner-current)) 0)) diff --git a/tests/nar.scm b/tests/nar.scm index e24a638db9..9796980e35 100644 --- a/tests/nar.scm +++ b/tests/nar.scm @@ -320,9 +320,6 @@ (test-end "nar") - -(exit (= (test-runner-fail-count (test-runner-current)) 0)) - ;;; Local Variables: ;;; eval: (put 'with-file-tree 'scheme-indent-function 2) ;;; End: diff --git a/tests/packages.scm b/tests/packages.scm index 823ede1f25..94e8150b75 100644 --- a/tests/packages.scm +++ b/tests/packages.scm @@ -799,9 +799,6 @@ (test-end "packages") - -(exit (= (test-runner-fail-count (test-runner-current)) 0)) - ;;; Local Variables: ;;; eval: (put 'dummy-package 'scheme-indent-function 1) ;;; End: diff --git a/tests/pk-crypto.scm b/tests/pk-crypto.scm index f5008f3248..5024a15a43 100644 --- a/tests/pk-crypto.scm +++ b/tests/pk-crypto.scm @@ -287,6 +287,3 @@ (canonical-sexp->sexp (sexp->canonical-sexp sexp)))) (test-end) - - -(exit (= (test-runner-fail-count (test-runner-current)) 0)) diff --git a/tests/pki.scm b/tests/pki.scm index 51f2119466..876ad98d73 100644 --- a/tests/pki.scm +++ b/tests/pki.scm @@ -119,6 +119,3 @@ (corrupt-signature 'c)))) (test-end) - - -(exit (= (test-runner-fail-count (test-runner-current)) 0)) diff --git a/tests/profiles.scm b/tests/profiles.scm index 6714dfcaa7..fc1dfd2bfc 100644 --- a/tests/profiles.scm +++ b/tests/profiles.scm @@ -320,9 +320,6 @@ (test-end "profiles") - -(exit (= (test-runner-fail-count (test-runner-current)) 0)) - ;;; Local Variables: ;;; eval: (put 'dummy-package 'scheme-indent-function 1) ;;; End: diff --git a/tests/publish.scm b/tests/publish.scm index 6c710fe0a7..6645286f5a 100644 --- a/tests/publish.scm +++ b/tests/publish.scm @@ -121,6 +121,3 @@ References: ~a~%" (response-code (http-get (publish-uri (string-append "/nar/invalid")))))) (test-end "publish") - - -(exit (= (test-runner-fail-count (test-runner-current)) 0)) diff --git a/tests/pypi.scm b/tests/pypi.scm index cf351a542f..e463467c41 100644 --- a/tests/pypi.scm +++ b/tests/pypi.scm @@ -106,6 +106,3 @@ baz > 13.37") (pk 'fail x #f))))) (test-end "pypi") - - -(exit (= (test-runner-fail-count (test-runner-current)) 0)) diff --git a/tests/records.scm b/tests/records.scm index 800ed03827..c6f85d4a81 100644 --- a/tests/records.scm +++ b/tests/records.scm @@ -305,6 +305,3 @@ Description: 1st line, '("a"))) (test-end) - - -(exit (= (test-runner-fail-count (test-runner-current)) 0)) diff --git a/tests/scripts-build.scm b/tests/scripts-build.scm index cf9770e952..e48c8da264 100644 --- a/tests/scripts-build.scm +++ b/tests/scripts-build.scm @@ -103,6 +103,3 @@ (eq? dep findutils))))))))))) (test-end) - - -(exit (= (test-runner-fail-count (test-runner-current)) 0)) diff --git a/tests/scripts.scm b/tests/scripts.scm index 3bf41aed4d..3901710953 100644 --- a/tests/scripts.scm +++ b/tests/scripts.scm @@ -64,9 +64,6 @@ (test-end "scripts") - -(exit (= (test-runner-fail-count (test-runner-current)) 0)) - ;;; Local Variables: ;;; eval: (put 'with-environment-variable 'scheme-indent-function 2) ;;; End: diff --git a/tests/services.scm b/tests/services.scm index 3635549077..477a197160 100644 --- a/tests/services.scm +++ b/tests/services.scm @@ -119,6 +119,3 @@ (null? (e s3))))) (test-end) - - -(exit (= (test-runner-fail-count (test-runner-current)) 0)) diff --git a/tests/sets.scm b/tests/sets.scm index 0a89591765..cdb7efe172 100644 --- a/tests/sets.scm +++ b/tests/sets.scm @@ -47,6 +47,3 @@ (set-contains? s3 b)))) (test-end) - - -(exit (= (test-runner-fail-count (test-runner-current)) 0)) diff --git a/tests/size.scm b/tests/size.scm index a1106045f8..fcd590283d 100644 --- a/tests/size.scm +++ b/tests/size.scm @@ -88,9 +88,6 @@ (test-end "size") - -(exit (= (test-runner-fail-count (test-runner-current)) 0)) - ;;; Local Variables: ;;; eval: (put 'match* 'scheme-indent-function 1) ;;; End: diff --git a/tests/snix.scm b/tests/snix.scm index a66b2c7b60..4c31e3389d 100644 --- a/tests/snix.scm +++ b/tests/snix.scm @@ -71,6 +71,3 @@ (pk 'fail x #f)))) (test-end "snix") - - -(exit (= (test-runner-fail-count (test-runner-current)) 0)) diff --git a/tests/store.scm b/tests/store.scm index f7db7df966..eeadcb94f8 100644 --- a/tests/store.scm +++ b/tests/store.scm @@ -911,6 +911,3 @@ (path-info-deriver (query-path-info %store o)))))) (test-end "store") - - -(exit (= (test-runner-fail-count (test-runner-current)) 0)) diff --git a/tests/substitute.scm b/tests/substitute.scm index 9d907e7abf..69b272f2bb 100644 --- a/tests/substitute.scm +++ b/tests/substitute.scm @@ -275,9 +275,6 @@ a file for NARINFO." (test-end "substitute") - -(exit (= (test-runner-fail-count (test-runner-current)) 0)) - ;;; Local Variables: ;;; eval: (put 'with-narinfo 'scheme-indent-function 1) ;;; eval: (put 'test-quit 'scheme-indent-function 2) diff --git a/tests/syscalls.scm b/tests/syscalls.scm index feeb74c11b..8e24184fe2 100644 --- a/tests/syscalls.scm +++ b/tests/syscalls.scm @@ -245,6 +245,3 @@ (lo (interface-address lo))))))) (test-end) - - -(exit (= (test-runner-fail-count (test-runner-current)) 0)) diff --git a/tests/system.scm b/tests/system.scm index 7e016a610b..b935bd07eb 100644 --- a/tests/system.scm +++ b/tests/system.scm @@ -72,6 +72,3 @@ (eq? gnu (operating-system-store-file-system os)))) (test-end) - - -(exit (= (test-runner-fail-count (test-runner-current)) 0)) diff --git a/tests/ui.scm b/tests/ui.scm index f28e623ccf..51577acb76 100644 --- a/tests/ui.scm +++ b/tests/ui.scm @@ -250,6 +250,3 @@ Second line" 24)) (show-manifest-transaction store m t))))))))) (test-end "ui") - - -(exit (= (test-runner-fail-count (test-runner-current)) 0)) diff --git a/tests/union.scm b/tests/union.scm index 22ba67ce99..cccf397181 100644 --- a/tests/union.scm +++ b/tests/union.scm @@ -125,6 +125,3 @@ (eq? 'directory (stat:type (lstat "bin")))))))) (test-end) - - -(exit (= (test-runner-fail-count (test-runner-current)) 0)) diff --git a/tests/upstream.scm b/tests/upstream.scm index eb18dd6193..6c86abe817 100644 --- a/tests/upstream.scm +++ b/tests/upstream.scm @@ -44,6 +44,3 @@ '("ftp://example.org/foo-1.tar.xz.sig")))))) (test-end) - - -(exit (= (test-runner-fail-count (test-runner-current)) 0)) diff --git a/tests/utils.scm b/tests/utils.scm index 67b3724451..6b7725554f 100644 --- a/tests/utils.scm +++ b/tests/utils.scm @@ -336,6 +336,3 @@ (test-end) (false-if-exception (delete-file temp-file)) - - -(exit (= (test-runner-fail-count (test-runner-current)) 0)) |