Travis: refactored how to launch tests

tuttleofx · May 30, 2016 · 2594692 · 2594692
1 parent f6d74c0
commit 2594692
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/tools/travis/launch_tests.sh b/tools/travis/launch_tests.sh
@@ -16,19 +16,18 @@ git clone https://github.com/tuttleofx/TuttleOFX-data.git
 
 # nosetests
 ln -s ${TRAVIS_BUILD_DIR}/TuttleOFX-data ${TRAVIS_BUILD_DIR}/libraries/tuttle/pyTest/TuttleOFX-data
-if [[ ${PYTHON_VERSION} == "2.7" ]]; then
-    nosetests ${TRAVIS_BUILD_DIR}/libraries/tuttle/pyTest -v
-elif [[ ${PYTHON_VERSION} == "3.4" ]]; then
-    nosetests3 ${TRAVIS_BUILD_DIR}/libraries/tuttle/pyTest -v
+export NOSETESTS_BIN=nosetests
+if [[ ${PYTHON_VERSION} == 3.* ]]; then
+    export NOSETESTS_BIN=nosetests3
 fi
-
+${NOSETESTS_BIN} ${TRAVIS_BUILD_DIR}/libraries/tuttle/pyTest -v
 
 # boost unit tests
 ln -s ${TRAVIS_BUILD_DIR}/TuttleOFX-data ${TRAVIS_BUILD_DIR}/testBin/TuttleOFX-data
 cd ${TUTTLEOFX_BUILD}
 make run_tests
 
 # sam tests
-if [[ ${PYTHON_VERSION} == "2.7" ]]; then
+if [[ ${PYTHON_VERSION} == 2.* ]]; then
     ${TRAVIS_BUILD_DIR}/applications/test/samCommands.sh
 fi