diff options
| author | diosmosis <benakamoorthi@fastmail.fm> | 2014-03-10 15:34:59 +0400 |
|---|---|---|
| committer | diosmosis <benakamoorthi@fastmail.fm> | 2014-03-10 15:35:18 +0400 |
| commit | 4e9fc594cea4c52731631967bfa43bee964c78dc (patch) | |
| tree | 94bdd58bbaf47dea5d8d56365c6638a23d668c7f /tests/PHPUnit/travis.sh | |
| parent | 720639c919024eceed9d64e9a57d9c9ada6eda43 (diff) | |
Fixing travis.sh script for UI tests build and make sure empty arguments don't get added to tests to execute in screenshot test runner.
Diffstat (limited to 'tests/PHPUnit/travis.sh')
| -rwxr-xr-x | tests/PHPUnit/travis.sh | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/tests/PHPUnit/travis.sh b/tests/PHPUnit/travis.sh index 864c4e598f..734862277b 100755 --- a/tests/PHPUnit/travis.sh +++ b/tests/PHPUnit/travis.sh @@ -6,25 +6,30 @@ then echo " Please add the @group phpdoc comment to the following tests: <=====" phpunit --group __nogroup__ --testdox | grep "[x]" exit 1 -else - if [ -n "$TEST_SUITE" ] +fi + +if [ -n "$TEST_SUITE" ] +then + if [ "$TEST_SUITE" = "JavascriptTests" ] then - if [ "$TEST_SUITE" = "JavascriptTests" ] - then - touch ../javascript/enable_sqlite - phantomjs ../javascript/testrunner.js - elif [ "$TEST_SUITE" = "UITests" ] - then - echo "" - echo "View UI failures (if any) here http://builds-artifacts.piwik.org/ui-tests.master/$TRAVIS_JOB_NUMBER/screenshot-diffs/diffviewer.html" - echo "If the new screenshots are valid, then you can copy them over to tests/PHPUnit/UI/expected-ui-screenshots/." - echo "" + touch ../javascript/enable_sqlite + phantomjs ../javascript/testrunner.js + elif [ "$TEST_SUITE" = "UITests" ] + then + echo "" + echo "View UI failures (if any) here http://builds-artifacts.piwik.org/ui-tests.master/$TRAVIS_JOB_NUMBER/screenshot-diffs/diffviewer.html" + echo "If the new screenshots are valid, then you can copy them over to tests/PHPUnit/UI/expected-ui-screenshots/." + echo "" - phantomjs ../lib/screenshot-testing/run-tests.js --store-in-ui-tests-repo --use-github-expected "$PLUGIN_NAME" + if [ -n "$PLUGIN_NAME" ] + then + phantomjs ../lib/screenshot-testing/run-tests.js --store-in-ui-tests-repo --use-github-expected else - phpunit --configuration phpunit.xml --testsuite $TEST_SUITE --colors + phantomjs ../lib/screenshot-testing/run-tests.js --use-github-expected $PLUGIN_NAME fi else - phpunit --configuration phpunit.xml --coverage-text --colors + phpunit --configuration phpunit.xml --testsuite $TEST_SUITE --colors fi +else + phpunit --configuration phpunit.xml --coverage-text --colors fi
\ No newline at end of file |