X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=test%2FMakefile;h=cf908beb7c607e34a9bcfcc210beb519567a103f;hp=557cbd50658da21b91653fc8c0e7f658d074ef23;hb=HEAD;hpb=d9b677a42a28fde6471b8467bffdf63ac9f144a3

diff --git a/test/Makefile b/test/Makefile
index 557cbd5..de8df77 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,45 +1,44 @@
 # Test-suite makefile for sst
 
-PYTHON=python
-
-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."
+	@$(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)"
+	@echo "1..$$(ls *.log | wc -l)"
 	@for test in $(TESTLOADS); \
 	do \
 	    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
+
+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