diff options
| author | Ludovic Courtès | 2021-09-29 18:21:19 +0200 |
|---|---|---|
| committer | Ludovic Courtès | 2021-09-29 18:26:39 +0200 |
| commit | 671e55bb3bbbb3467dee5d6e438ea897acda814e (patch) | |
| tree | a74d75536f01fd0a2bf1a6e30be222a543aa1e47 /tests | |
| parent | 632ff359c089892d55a15d29e7931bf0ce255d8e (diff) | |
| download | skribilo-671e55bb3bbbb3467dee5d6e438ea897acda814e.tar.gz skribilo-671e55bb3bbbb3467dee5d6e438ea897acda814e.tar.lz skribilo-671e55bb3bbbb3467dee5d6e438ea897acda814e.zip | |
build: Use SRFI-64 test suite driver as found in Guix.
This works around the fact that SRFI-64 in Guile 3.0.6+, 'test-runner-current' returns #f after 'test-end'. It also gives us a more featureful test runner, where one can do things like: make check TEST_LOG_DRIVER_FLAGS="--brief=no --show-duration=yes" Reported by <soeren@soeren-tempel.net>. * build-aux/test-driver.scm: New file. * Makefile.am (EXTRA_DIST): Add it. * tests/Makefile.am (TEST_LOG_DRIVER): New variable. (TEST_LOG_COMPILER): New variable. * tests/ast.test, tests/engines/info.test, tests/location.test, tests/readers/rss-2.test, tests/resolve.test: Remove call to 'exit'.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile.am | 7 | ||||
| -rw-r--r-- | tests/ast.test | 5 | ||||
| -rw-r--r-- | tests/engines/info.test | 4 | ||||
| -rw-r--r-- | tests/location.test | 5 | ||||
| -rw-r--r-- | tests/readers/rss-2.test | 4 | ||||
| -rw-r--r-- | tests/resolve.test | 4 |
6 files changed, 10 insertions, 19 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index b26700f..8ba7637 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -3,8 +3,11 @@ TESTS_ENVIRONMENT = \ GUILE_LOAD_COMPILED_PATH="$(top_builddir)/src/guile:$$GUILE_LOAD_COMPILED_PATH"; \ export GUILE_AUTO_COMPILE GUILE_LOAD_COMPILED_PATH; -TEST_LOG_COMPILER = \ - $(GUILE) -L $(top_srcdir)/src/guile -L $(top_builddir)/src/guile +TEST_LOG_DRIVER = \ + $(GUILE) --no-auto-compile -e main \ + -L "$(top_srcdir)/src/guile" -L "$(top_builddir)/src/guile" \ + -L "$(srcdir)" \ + "$(top_srcdir)/build-aux/test-driver.scm" TESTS = \ ast.test \ diff --git a/tests/ast.test b/tests/ast.test index 8b8db48..1110faf 100644 --- a/tests/ast.test +++ b/tests/ast.test @@ -1,6 +1,6 @@ ;;; Excercise the AST routines. -*- Scheme -*- ;;; -;;; Copyright (C) 2009, 2012 Ludovic Courtès <ludo@gnu.org> +;;; Copyright (C) 2009, 2012, 2021 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of Skribilo. ;;; @@ -111,6 +111,3 @@ '("0" "1" "2")))) (test-end "ast") - - -(exit (= (test-runner-fail-count (test-runner-current)) 0)) diff --git a/tests/engines/info.test b/tests/engines/info.test index ea3f17e..960daa7 100644 --- a/tests/engines/info.test +++ b/tests/engines/info.test @@ -1,6 +1,6 @@ ;;; Test the Info engine. -*- Scheme -*- ;;; -;;; Copyright (C) 2012 Ludovic Courtès <ludo@gnu.org> +;;; Copyright (C) 2012, 2021 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of Skribilo. ;;; @@ -89,8 +89,6 @@ (test-end "info") -(exit (= (test-runner-fail-count (test-runner-current)) 0)) - ;; Local Variables: ;; coding: utf-8 ;; eval: (put 'test-assert 'scheme-indent-function 1) diff --git a/tests/location.test b/tests/location.test index ae6c462..6c3dac5 100644 --- a/tests/location.test +++ b/tests/location.test @@ -1,6 +1,6 @@ ;;; Check the AST source location info. -*- Scheme -*- ;;; -;;; Copyright (C) 2012, 2020 Ludovic Courtès <ludo@gnu.org> +;;; Copyright (C) 2012, 2020, 2021 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of Skribilo. ;;; @@ -88,9 +88,6 @@ (test-end "location") - -(exit (= (test-runner-fail-count (test-runner-current)) 0)) - ;; Local Variables: ;; eval: (put 'call-with-code 'scheme-indent-function 1) ;; eval: (put 'test-location 'scheme-indent-function 1) diff --git a/tests/readers/rss-2.test b/tests/readers/rss-2.test index a0e5838..1b72d9f 100644 --- a/tests/readers/rss-2.test +++ b/tests/readers/rss-2.test @@ -1,6 +1,6 @@ ;;; Excercise RSS 2.0 reader. -*- Scheme -*- ;;; -;;; Copyright (C) 2008, 2009, 2012, 2020 Ludovic Courtès <ludo@gnu.org> +;;; Copyright (C) 2008, 2009, 2012, 2020, 2021 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of Skribilo. ;;; @@ -148,5 +148,3 @@ (test-end "rss-2") -(exit (= (test-runner-fail-count (test-runner-current)) 0)) - diff --git a/tests/resolve.test b/tests/resolve.test index 1241aab..41e93d8 100644 --- a/tests/resolve.test +++ b/tests/resolve.test @@ -1,6 +1,6 @@ ;;; Excercise the `resolve' routines. -*- Scheme -*- ;;; -;;; Copyright (C) 2009 Ludovic Courtès <ludo@gnu.org> +;;; Copyright (C) 2009, 2021 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of Skribilo. ;;; @@ -215,5 +215,3 @@ (test-end "resolve") - -(exit (= (test-runner-fail-count (test-runner-current)) 0)) |