guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: PRELIM build: Add a scheme custom test driver using SRFI-64.


From: Mathieu Lirzin
Subject: 01/01: PRELIM build: Add a scheme custom test driver using SRFI-64.
Date: Sun, 20 Mar 2016 00:13:08 +0000

mthl pushed a commit to branch wip-check
in repository guix.

commit 2ba54e53bbdb1491dce3b39007a949395202f8f8
Author: Mathieu Lirzin <address@hidden>
Date:   Mon Oct 26 23:47:24 2015 +0100

    PRELIM build: Add a scheme custom test driver using SRFI-64.
    
    XXX: Need fix for tests/container.scm & tests/cpio.scm.
    
    This provides support for multiple scheme test cases in a unique file and
    fixes the fragmentation of '.log' files.
    
    * build-aux/test-driver.scm: New file.
    * Makefile.am (SCM_LOG_DRIVER, AM_SCM_LOG_DRIVER_FLAGS): New variables.
    (SCM_LOG_COMPILER, AM_SCM_LOG_FLAGS): Delete variables.
    (AM_TESTS_ENVIRONMENT): Set GUILE_AUTO_COMPILE to 0.
    * doc/guix.texi (Running the Test Suite): Reporting a bug does not
    require providing a specific '.log' file anymore.
    * tests/base32.scm, tests/build-utils.scm, tests/builders.scm,
    tests/challenge.scm, tests/containers.scm, tests/cpan.scm,
    tests/cpio.scm, tests/cran.scm, tests/cve.scm, tests/derivations.scm,
    tests/elpa.scm, tests/file-systems.scm, tests/gem.scm, tests/gexp.scm,
    tests/gnu-maintenance.scm, tests/graph.scm, tests/gremlin.scm,
    tests/hackage.scm, tests/hash.scm, tests/import-utils.scm,
    tests/lint.scm, tests/monads.scm, tests/nar.scm, tests/packages.scm,
    tests/pk-crypto.scm, tests/pki.scm, tests/profiles.scm,
    tests/publish.scm, tests/pypi.scm, tests/records.scm,
    tests/scripts-build.scm, tests/scripts.scm, tests/services.scm,
    tests/sets.scm, tests/size.scm, tests/snix.scm, tests/store.scm,
    tests/substitute.scm, tests/syscalls.scm, tests/system.scm,
    tests/ui.scm, tests/union.scm, tests/utils.scm: Don't exit at the end of
    each test.
---
 Makefile.am               |   11 ++-
 build-aux/test-driver.scm |  191 +++++++++++++++++++++++++++++++++++++++++++++
 doc/guix.texi             |    8 +-
 tests/base32.scm          |    3 -
 tests/build-utils.scm     |    3 -
 tests/builders.scm        |    3 -
 tests/challenge.scm       |    3 -
 tests/containers.scm      |    3 -
 tests/cpan.scm            |    3 -
 tests/cpio.scm            |    5 +-
 tests/cran.scm            |    3 -
 tests/cve.scm             |    3 -
 tests/derivations.scm     |    3 -
 tests/elpa.scm            |    3 -
 tests/file-systems.scm    |    3 -
 tests/gem.scm             |    3 -
 tests/gexp.scm            |    3 -
 tests/gnu-maintenance.scm |    3 -
 tests/graph.scm           |    3 -
 tests/gremlin.scm         |    3 -
 tests/hackage.scm         |    3 -
 tests/hash.scm            |    3 -
 tests/import-utils.scm    |    3 -
 tests/lint.scm            |    3 -
 tests/monads.scm          |    3 -
 tests/nar.scm             |    3 -
 tests/packages.scm        |    3 -
 tests/pk-crypto.scm       |    3 -
 tests/pki.scm             |    3 -
 tests/profiles.scm        |    3 -
 tests/publish.scm         |    3 -
 tests/pypi.scm            |    3 -
 tests/records.scm         |    3 -
 tests/scripts-build.scm   |    3 -
 tests/scripts.scm         |    3 -
 tests/services.scm        |    3 -
 tests/sets.scm            |    3 -
 tests/size.scm            |    3 -
 tests/snix.scm            |    3 -
 tests/store.scm           |    3 -
 tests/substitute.scm      |    3 -
 tests/syscalls.scm        |    3 -
 tests/system.scm          |    3 -
 tests/ui.scm              |    3 -
 tests/union.scm           |    3 -
 tests/utils.scm           |    3 -
 46 files changed, 203 insertions(+), 138 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index a9c281d..204444e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -256,9 +256,11 @@ SCM_TESTS =                                        \
   tests/system.scm                             \
   tests/services.scm                           \
   tests/scripts-build.scm                      \
-  tests/containers.scm                         \
   tests/import-utils.scm
 
+# XXX: tests/containers.scm needs a removal of `exit' calls.
+# tests/containers.scm
+
 if HAVE_GUILE_JSON
 
 SCM_TESTS +=                                   \
@@ -292,10 +294,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 0000000..72f0baa
--- /dev/null
+++ b/build-aux/test-driver.scm
@@ -0,0 +1,191 @@
+;;;; test-driver.scm --- SRFI-64 custom driver for GNU Automake test suites.
+
+(define script-version "2016-03-18.23") ;UTC
+
+;;; Copyright © 2015, 2016 Mathieu Lirzin <address@hidden>
+;;;
+;;; 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 custom test driver for GNU Automake using the
+;;; SRFI-64 Scheme API for test suites.
+;;;
+;;;; 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)) ;XXX: 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:\n" field)
+        (pretty-print value port #:per-line-prefix "+ "))
+      (format port "~A: ~A\n" 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)       "")  ;green
+                         ((xfail)      "")  ;light green
+                         ((skip)       "")  ;blue
+                         ((fail xpass) "")  ;red
+                         ((error)      "")) ;magenta
+                       result
+                       "")          ;no color
+        result)))
+
+(define* (test-runner-gnu test-name #:key color-tests 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-TESTS and BRIEF are booleans.
+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 ((results (test-result-alist runner)))
+      (test-display "test-name" (assq-ref results 'test-name))
+      (test-display "location"
+                    (string-append (assq-ref results 'source-file) ":"
+                                   (number->string
+                                    (assq-ref results 'source-line))))
+      (test-display "source" (assq-ref results 'source-form) #:pretty? #t)))
+
+  (define (test-on-test-end-gnu runner)
+    "Procedure called at the end of an individual testcase, when the result of
+the test is available."
+    (let ((results (test-result-alist runner)))
+      (unless brief
+        ;; Display the result of each test case on the console.
+        (test-display
+         (result->string (test-result-kind runner) #:colorize color-tests)
+         (string-append test-name " - " (test-runner-test-name runner))
+         out-port))
+      (when (assq 'expected-value results)
+        (test-display "expected-value" (assq-ref results 'expected-value)))
+      (when (assq 'expected-error results)
+        (test-display "expected-error" (assq-ref results 'expected-error)
+                      #:pretty? #t))
+      (when (assq 'actual-value results)
+        (test-display "actual-value" (assq-ref results 'actual-value)))
+      (when (assq 'actual-error results)
+        (test-display "actual-error" (assq-ref results 'actual-error)
+                      #:pretty? #t))
+      (test-display "result" (result->string (assq-ref results '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: Since multiple tests share one '.trs' file, we need to choose
+      ;; what to report in the "global" results which would require more
+      ;; refinements.
+      (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 'pass)
+                                      #:colorize color-tests)
+                      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)))
+    (when (option-ref opts 'help #f)
+      (show-help)
+      (exit 0))
+    (when (option-ref opts 'version #f)
+      (format #t "test-driver.scm ~A" script-version)
+      (exit 0))
+    (let ((trs (open-output-file (option-ref opts 'trs-file ""))))
+      (test-with-runner (test-runner-gnu
+                         (option-ref opts 'test-name #f)
+                         #:color-tests (option->boolean opts 'color-tests)
+                         #:brief (option->boolean opts 'brief)
+                         #:out-port (current-output-port)
+                         #:trs-port trs)
+        (call-with-output-file (option-ref opts 'log-file "")
+          (lambda (port)
+            (set-current-output-port port)
+            (set-current-error-port port)
+            (load-from-path (option-ref opts 'test-name #f)))))
+      (close-port trs)
+      (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 868948a..201c2df 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -577,11 +577,9 @@ make check TESTS="tests/store.scm tests/cpio.scm"
 @end example
 
 Upon failure, please email @email{bug-guix@@gnu.org} and attach the
address@hidden file.  When @file{tests/@var{something}.scm}
-fails, please also attach the @address@hidden 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.
address@hidden 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/tests/base32.scm b/tests/base32.scm
index dcd926f..194f8da 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 b0a4d15..cc96738 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 a7c3e42..bb9e0fa 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 e53cacd..9505042 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 12982a6..84efa5c 100644
--- a/tests/containers.scm
+++ b/tests/containers.scm
@@ -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 5836841..5d56f0b 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 cf65f98..e5c489e 100644
--- a/tests/cpio.scm
+++ b/tests/cpio.scm
@@ -46,6 +46,8 @@
           (equal? header (read-cpio-header port)))))))
 
 (unless %cpio-program (test-skip 1))
+;; XXX: This Test fails with the new test driver.  See
+;; https://lists.gnu.org/archive/html/guix-devel/2015-11/msg00019.html
 (test-assert "bit-identical to GNU cpio's output"
   (call-with-temporary-output-file
    (lambda (link _)
@@ -79,6 +81,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 83d2e7f..896c5af 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 26bc560..26e710c 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 3c35218..223f980 100644
--- a/tests/derivations.scm
+++ b/tests/derivations.scm
@@ -980,6 +980,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 e8adde3..46c6ac2 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 c36509b..aed27e8 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 ebce809..0b37c70 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 d343dc3..3c98d9c 100644
--- a/tests/gexp.scm
+++ b/tests/gexp.scm
@@ -760,9 +760,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 e729613..4f2f1ae 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/graph.scm b/tests/graph.scm
index 4205b9b..3231719 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 dc9f78c..2885554 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 b608ccd..d1ebe37 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 9bcd694..8039549 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 0836581..3b11875 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 54be50d..4f01964 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 4112bcb..18bf411 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 e24a638..9796980 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 823ede1..94e8150 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 f5008f3..5024a15 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 51f2119..876ad98 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 6714dfc..fc1dfd2 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 6c710fe..6645286 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 cf351a5..e463467 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 800ed03..c6f85d4 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 94ddaf4..59b1430 100644
--- a/tests/scripts-build.scm
+++ b/tests/scripts-build.scm
@@ -83,6 +83,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 3bf41ae..3901710 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 3635549..477a197 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 0a89591..cdb7efe 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 a110604..fcd5902 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 a66b2c7..4c31e33 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 f7db7df..eeadcb9 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 9d907e7..69b272f 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 a57a9ca..c5e9f8e 100644
--- a/tests/syscalls.scm
+++ b/tests/syscalls.scm
@@ -241,6 +241,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 7e016a6..b935bd0 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 f28e623..51577ac 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 22ba67c..cccf397 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/utils.scm b/tests/utils.scm
index 67b3724..6b77255 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))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]