From a3dbc73c20b72e5c06eb78a3a8cdedf81ad2aa4d Mon Sep 17 00:00:00 2001 From: Benson Margulies Date: Tue, 3 Nov 2015 10:37:30 -0500 Subject: [PATCH] Try something simpler for travis. --- Makefile | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index e07be69..7270012 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ PYTHON=python3 NOSETESTS=nosetests-3.4 else PYTHON=python -NOSETESTS=nosetests-2.7 +NOSETESTS=nosetests endif JAVAC_OPTS=-target 1.6 -source 1.6 @@ -26,9 +26,7 @@ clean: html: $(MAKE) -C docs html -tests: test2 test3 - -tests2: +# for use in travis; tests whatever you got. +# use PYTHON3=1 to force python3 in other environments. +tests: (cd tests; env CLASSPATH=../build/test-classes:../build/classes PYTHONPATH=..:$(PYTHONPATH) $(NOSETESTS) -v) -tests3: - make tests2 PYTHON3=1