diff options
| author | Thomas Steur <thomas.steur@gmail.com> | 2013-11-25 06:43:33 +0400 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@gmail.com> | 2013-11-25 06:43:33 +0400 |
| commit | effabcce52c46b853417a8e543c899913916cd24 (patch) | |
| tree | 7a4cd1d9211c4d10a6b57375a3bfb9692ab13833 /tests/PHPUnit/travis.sh | |
| parent | c58dffe96e47a0122c369b5d820b522c48ba3e9d (diff) | |
refs #4225 if we are running a testsuite, run the JS tests as well
Diffstat (limited to 'tests/PHPUnit/travis.sh')
| -rwxr-xr-x | tests/PHPUnit/travis.sh | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/tests/PHPUnit/travis.sh b/tests/PHPUnit/travis.sh index b3f7909239..dcc127b601 100755 --- a/tests/PHPUnit/travis.sh +++ b/tests/PHPUnit/travis.sh @@ -1,5 +1,9 @@ #!/bin/bash +RESULT_JS=0 +RESULT_PHP=0 +touch ../javascript/enable_sqlite + if [ `phpunit --group __nogroup__ | grep "No tests executed" | wc -l` -ne 1 ] then echo "=====> There are some tests functions which do not have a @group set. " @@ -10,6 +14,9 @@ else if [ -n "$TEST_SUITE" ] then phpunit --configuration phpunit.xml --testsuite $TEST_SUITE --colors + RESULT_PHP=$? + phantomjs ../javascript/testrunner.js + RESULT_JS=$? else if [ -n "$TEST_DIR" ] then @@ -22,8 +29,16 @@ else fi phpunit --colors $TEST_DIR + RESULT_PHP=$? else phpunit --configuration phpunit.xml --coverage-text --colors + RESULT_PHP=$? fi fi +fi + +if [ 0 == $RESULT_PHP ] && [ 0 == $RESULT_JS ]; then + exit 0; +else + exit 1; fi
\ No newline at end of file |