From b057d69f8ee04bc2a5fe692f5a2fafbf169e879b Mon Sep 17 00:00:00 2001 From: James Cole Date: Sat, 19 Nov 2016 16:07:02 +0100 Subject: [PATCH] Correct travis configuration. --- .travis.yml | 5 +++-- test.sh | 7 +++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0863a11f23..0d768b2bcd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,8 @@ language: php sudo: false php: - - 7 + - '7.0' + - hhvm install: - phpenv config-rm xdebug.ini @@ -13,7 +14,7 @@ install: - php artisan env - mv -v .env.testing .env - php artisan env - - test.sh --notest + - ./test.sh --notest script: - phpunit \ No newline at end of file diff --git a/test.sh b/test.sh index 6c2e7847fd..0ece8440dc 100755 --- a/test.sh +++ b/test.sh @@ -34,8 +34,11 @@ fi cp $DATABASECOPY $DATABASE # run PHPUnit - -phpunit +if [ "$1" == "--notest" ]; then + echo "Must not run PHPUnit" +else + phpunit +fi # restore current config: mv .env.current .env \ No newline at end of file