X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=test%2FMakefile;h=cf908beb7c607e34a9bcfcc210beb519567a103f;hp=d77b4e070c3767cda39753381ceddf76848201af;hb=f738d498a8cd1b2e72836f597b7a4ae8e087afcc;hpb=d9d462108caaa581d11b93699412160dda944128 diff --git a/test/Makefile b/test/Makefile index d77b4e0..cf908be 100644 --- a/test/Makefile +++ b/test/Makefile @@ -1,6 +1,12 @@ # Test-suite makefile for sst -all: regress +PYTHON=python + +all: + @echo "With Python 2:" + @$(MAKE) -e PYTHON=python2 regress + @echo "With Python 3:" + @$(MAKE) -e PYTHON=python3 regress @echo "No diff output is good news." .SUFFIXES: .log .chk @@ -22,8 +28,8 @@ regress: do \ if [ ! -f $${test}.tst ] ; \ then \ - (if echo "Testing $${test}" >&2; \ - ../sst.py -r $${test}.log >/tmp/regress 2>&1; \ + (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;) \ fi \