mirror of
https://github.com/deajan/obackup.git
synced 2025-05-10 12:13:41 +02:00
Fixed shunit2 runner
This commit is contained in:
parent
e5b0b89b70
commit
a14431c828
@ -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
|
||||||
|
@ -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"
|
||||||
|
Loading…
Reference in New Issue
Block a user