X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=test%2FMakefile;h=11be77ca2d92633423ec5c9c10ad3195e21c5e47;hb=53e4feec7d6e15846b75f6813a8ba49ebdc7d9fb;hp=a0d91268843cbdeed72418fbd92af9dcda24dd6b;hpb=08da62875d9b030f0a8d98a702ee5b242f984477;p=super-star-trek.git

diff --git a/test/Makefile b/test/Makefile
index a0d9126..11be77c 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,30 +1,18 @@
 # Test-suite makefile for sst
 
-PYTHON=python
-
-# The tests output TAP (Test Anything Proocol)
-# If you have either of these TAP viwers installed,
-# S good ing will happen.
-TAPVIEWER=cat
-ifeq (,$(command -v tapview))
-	TAPVIEWER=tapview
-else
-	ifeq (,$(command -v tappy))
-		TAPVIEWER=tappy
-	endif
-endif
+PYTHON=python3
 
 all:
 	@echo "With Python 2:"
-	@$(MAKE) -e PYTHON=python2 regress | $(TAPVIEWER)
+	@$(MAKE) -e PYTHON=python2 regress | ./tapview
 	@echo "With Python 3:"
-	@$(MAKE) -e PYTHON=python3 regress | $(TAPVIEWER)
+	@$(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:
@@ -32,7 +20,7 @@ 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:
@@ -42,7 +30,7 @@ regress:
 	    if [ ! -f $${test}.tst ] ; \
 	    then \
 		legend=$$(sed -n -e '/# Test/s//Test/p' <$${test}.log); \
-		../sst.py -r "$${test}.log" | ./tapdiffer "$${legend}" "$${test}.chk"; \
+		../sst -r "$${test}.log" | ./tapdiffer "$${legend}" "$${test}.chk"; \
 	    fi \
 	done
 	@rm -f /tmp/regress