Skip to content

Commit 2594692

Browse files
author
Clement Champetier
committed
Travis: refactored how to launch tests
1 parent f6d74c0 commit 2594692

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

tools/travis/launch_tests.sh

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,18 @@ git clone https://github.com/tuttleofx/TuttleOFX-data.git
1616

1717
# nosetests
1818
ln -s ${TRAVIS_BUILD_DIR}/TuttleOFX-data ${TRAVIS_BUILD_DIR}/libraries/tuttle/pyTest/TuttleOFX-data
19-
if [[ ${PYTHON_VERSION} == "2.7" ]]; then
20-
nosetests ${TRAVIS_BUILD_DIR}/libraries/tuttle/pyTest -v
21-
elif [[ ${PYTHON_VERSION} == "3.4" ]]; then
22-
nosetests3 ${TRAVIS_BUILD_DIR}/libraries/tuttle/pyTest -v
19+
export NOSETESTS_BIN=nosetests
20+
if [[ ${PYTHON_VERSION} == 3.* ]]; then
21+
export NOSETESTS_BIN=nosetests3
2322
fi
24-
23+
${NOSETESTS_BIN} ${TRAVIS_BUILD_DIR}/libraries/tuttle/pyTest -v
2524

2625
# boost unit tests
2726
ln -s ${TRAVIS_BUILD_DIR}/TuttleOFX-data ${TRAVIS_BUILD_DIR}/testBin/TuttleOFX-data
2827
cd ${TUTTLEOFX_BUILD}
2928
make run_tests
3029

3130
# sam tests
32-
if [[ ${PYTHON_VERSION} == "2.7" ]]; then
31+
if [[ ${PYTHON_VERSION} == 2.* ]]; then
3332
${TRAVIS_BUILD_DIR}/applications/test/samCommands.sh
3433
fi

0 commit comments

Comments
 (0)