X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=test%2FMakefile;h=557cbd50658da21b91653fc8c0e7f658d074ef23;hb=refs%2Fmerge-requests%2F4%2Fmerge;hp=91983cec35efe09436cf04851d06add6681ea079;hpb=b9262a12fb1dc8dc7d4772fd72c88e79e582d1c6;p=super-star-trek.git

diff --git a/test/Makefile b/test/Makefile
index 91983ce..557cbd5 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,8 +1,21 @@
 # Test-suite makefile for sst
 
-PYTHON=python2
+PYTHON=python
 
-all: regress
+TAPFILTER=cat
+ifeq (,$(command -v tapview))
+	TAPFILTER=tapview
+else
+	ifeq (,$(command -v tappy))
+		TAPFILTER=tappy
+	endif
+endif
+
+all:
+	@echo "With Python 2:"
+	@$(MAKE) -e PYTHON=python2 regress | $(TAPFILTER)
+	@echo "With Python 3:"
+	@$(MAKE) -e PYTHON=python3 regress | $(TAPFILTER)
 	@echo "No diff output is good news."
 
 .SUFFIXES: .log .chk
@@ -20,14 +33,13 @@ buildregress:
 	    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.py -r "$${test}.log" | ./tapdiffer "$${legend}" "$${test}.chk"; \
 	    fi \
 	done
 	@rm -f /tmp/regress