Remove debris from test comment.

[super-star-trek.git] / test / Makefile

diff --git a/test/Makefile b/test/Makefile
index cf908beb7c607e34a9bcfcc210beb519567a103f..dd1f5740669c5e8d269266091dcc00d6312b3c1c 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,18 +1,18 @@
 # Test-suite makefile for sst
 
-PYTHON=python
+PYTHON=python3
 
 all:
        @echo "With Python 2:"
-       @$(MAKE) -e PYTHON=python2 regress
+       @$(MAKE) -e PYTHON=python2 regress | ./tapview
        @echo "With Python 3:"
-       @$(MAKE) -e PYTHON=python3 regress
+       @$(MAKE) -e PYTHON=python3 regress | ./tapview
        @echo "No diff output is good news."
 
 .SUFFIXES: .log .chk
 
 .log.chk:
-       ../sst.py -r $< >$@ 2>&1
+       ../sst -r $< >$@ 2>&1
 
 TESTLOADS := $(shell ls *.log | sed '/.log/s///')
 buildregress:
@@ -20,18 +20,17 @@ buildregress:
            if [ ! -f $${test}.tst ] ; \
            then \
                    echo "Remaking $${test}.chk"; \
-                   rm -f $${test}.chk && ../sst.py -r $${test}.log >$${test}.chk 2>&1; \
+                   rm -f $${test}.chk && ../sst -r $${test}.log >$${test}.chk 2>&1; \
            fi \
        done
 regress:
+       @echo "1..$$(ls *.log | wc -l)"
        @for test in $(TESTLOADS); \
        do \
            if [ ! -f $${test}.tst ] ; \
            then \
-               (if echo -n "$${test}: " >&2; grep 'Test' $${test}.log >&2;\
-               $(PYTHON) ../sst.py -r $${test}.log >/tmp/regress 2>&1; \
-               then diff -u $${test}.chk /tmp/regress; \
-               else echo "*** Nonzero return status on $${test}!"; exit 1; fi;) \
+               legend=$$(sed -n -e '/# Test/s//Test/p' <$${test}.log); \
+               ../sst -r "$${test}.log" | ./tapdiffer "$${legend}" "$${test}.chk"; \
            fi \
        done
        @rm -f /tmp/regress