Linux
/
obackup
mirror of https://github.com/deajan/obackup.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed shunit2 runner

This commit is contained in:
deajan 2016-09-02 13:27:39 +02:00
parent e5b0b89b70
commit a14431c828
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -12,4 +12,4 @@ before_script:
mysql -e 'CREATE DATABASE travistest;' mysql -e 'CREATE DATABASE travistest;'
script: script:
dev/tests/run_tests.sh travis TRAVIS_RUN=true dev/tests/run_tests.sh

6
dev/tests/run_tests.sh
View File

@ -9,10 +9,10 @@ OBACKUP_DIR=${OBACKUP_DIR%%/dev*}
DEV_DIR="$OBACKUP_DIR/dev" DEV_DIR="$OBACKUP_DIR/dev"
TESTS_DIR="$DEV_DIR/tests" TESTS_DIR="$DEV_DIR/tests"
if [ "$1" == "travis" ]; then if [ $TRAVIS_RUN == false ]; then
CONF_DIR="$TESTS_DIR/conf-travis"
else
CONF_DIR="$TESTS_DIR/conf-local" CONF_DIR="$TESTS_DIR/conf-local"
else
CONF_DIR="$TESTS_DIR/conf-travis"
fi fi
LOCAL_CONF="local.conf" LOCAL_CONF="local.conf"