From a14431c82892d6d5de0744d5397df8bc1039c166 Mon Sep 17 00:00:00 2001 From: deajan Date: Fri, 2 Sep 2016 13:27:39 +0200 Subject: [PATCH] Fixed shunit2 runner --- .travis.yml | 2 +- dev/tests/run_tests.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index e519b3b..1fe5658 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,4 +12,4 @@ before_script: mysql -e 'CREATE DATABASE travistest;' script: - dev/tests/run_tests.sh travis + TRAVIS_RUN=true dev/tests/run_tests.sh diff --git a/dev/tests/run_tests.sh b/dev/tests/run_tests.sh index 42e105b..fa07493 100755 --- a/dev/tests/run_tests.sh +++ b/dev/tests/run_tests.sh @@ -9,10 +9,10 @@ OBACKUP_DIR=${OBACKUP_DIR%%/dev*} DEV_DIR="$OBACKUP_DIR/dev" TESTS_DIR="$DEV_DIR/tests" -if [ "$1" == "travis" ]; then - CONF_DIR="$TESTS_DIR/conf-travis" -else +if [ $TRAVIS_RUN == false ]; then CONF_DIR="$TESTS_DIR/conf-local" +else + CONF_DIR="$TESTS_DIR/conf-travis" fi LOCAL_CONF="local.conf"