X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=test%2FMakefile;h=7b21af033e4783e0c9d3922a806387428b66a887;hp=91983cec35efe09436cf04851d06add6681ea079;hb=HEAD;hpb=b9262a12fb1dc8dc7d4772fd72c88e79e582d1c6

diff --git a/test/Makefile b/test/Makefile
index 91983ce..de8df77 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,33 +1,44 @@
 # Test-suite makefile for sst
 
-PYTHON=python2
-
-all: regress
-	@echo "No diff output is good news."
+all:
+	@$(MAKE) regress | ./tapview
 
 .SUFFIXES: .log .chk
 
 .log.chk:
-	../sst.py -r $< >$@ 2>&1
+	../sst -r $< >$@ 2>&1
 
 TESTLOADS := $(shell ls *.log | sed '/.log/s///')
-buildregress:
+rebuild:
 	@for test in $(TESTLOADS); do \
 	    if [ ! -f $${test}.tst ] ; \
-	    then \
+    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
+
+coverage:
+	@coverage erase
+	@for test in $(TESTLOADS); \
+	do \
+	    if [ ! -f $${test}.tst ] ; \
+	    then \
+		coverage run -a ../sst -r "$${test}.log" >/dev/null; \
+	    fi \
+	done
+	@coverage html
+
+clean:
+	rm -f .coverage htmlcov/index.html