Add test runner utility from David Thompson

diff --git a/Makefile.am b/Makefile.am
index f1ccbc31e5f6304d20baf427e0657620bf758c40..bd1587a24cb8fbddbb4a3d9c867db5b7a10f2e8e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -67,5 +67,5 @@ CLEANFILES =                                          \
 EXTRA_DIST =                                           \
        $(SOURCES)                                      \
        $(TESTS)                                        \
 EXTRA_DIST =                                           \
        $(SOURCES)                                      \
        $(TESTS)                                        \

-       pre-inst-env.in
-#      tests/utils.scm
+       pre-inst-env.in                                 \
+       tests/utils.scm

diff --git a/README.md b/README.md
index 4fd7bdf3b7f4efca26ef337745916a734fe20f66..f98f4338e306f4383e0bc3afabd45744af7577bf 100644 (file)
--- a/README.md
+++ b/README.md
@@ -40,3 +40,5 @@ Software Foundation, with exceptions below:
    linked, but I can't be sure.  If you really care, consider this
    whole project GPL v3 or later optionally... anyway a
    COPYING-gplv3.txt is included for these reasons.
    linked, but I can't be sure.  If you really care, consider this
    whole project GPL v3 or later optionally... anyway a
    COPYING-gplv3.txt is included for these reasons.

+ - Likewise, there's a single utility in tests/utils.scm from David
+   Thompson that's under GPLv3 or later.  See above.

diff --git a/tests/test-agenda.scm b/tests/test-agenda.scm
index bed99953d981b29f374f2ae970392a5a5f6aeeb1..06f24f35c9a6329321eafdea161510bcf71d4aec 100644 (file)
--- a/tests/test-agenda.scm
+++ b/tests/test-agenda.scm
@@ -19,11 +19,12 @@
 -s
 !#
 
 -s
 !#
 

-(define-module (tests test-core)
+(define-module (tests test-agenda)

   #:use-module (srfi srfi-64)
   #:use-module (ice-9 q)
   #:use-module (ice-9 receive)
   #:use-module (srfi srfi-64)
   #:use-module (ice-9 q)
   #:use-module (ice-9 receive)

-  #:use-module (eightsync agenda))
+  #:use-module (eightsync agenda)
+  #:use-module (tests utils))

 
 (test-begin "test-agenda")
 
 
 (test-begin "test-agenda")
 


@@ -335,5 +336,6 @@
 ;; End tests
 
 (test-end "test-agenda")
 ;; End tests
 
 (test-end "test-agenda")

-;; (test-exit)
+
+(test-exit)

 
 

diff --git a/tests/utils.scm b/tests/utils.scm
new file mode 100644 (file)
index 0000000..9ec2760
--- /dev/null
+++ b/tests/utils.scm
@@ -0,0 +1,24 @@
+;;; Totes taken from dave
+
+;;; srt2vtt --- SRT to WebVTT converter
+;;; Copyright © 2015 David Thompson <davet@gnu.org>
+;;;
+;;; srt2vtt 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.
+;;;
+;;; srt2vtt 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 srt2vtt.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (tests utils)
+  #:use-module (srfi srfi-64)
+  #:export (test-exit))
+
+(define (test-exit)
+  (exit (= (test-runner-fail-count (test-runner-current)) 0)))