Reinstate test of game-win logic.

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

diff --git a/test/Makefile b/test/Makefile
index a0d91268843cbdeed72418fbd92af9dcda24dd6b..f735cc70afef8f3c9016df7e8a929ee618dae866 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,24 +1,12 @@
 # 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