diff options
| author | Matthieu Napoli <matthieu@mnapoli.fr> | 2014-10-20 04:48:53 +0400 |
|---|---|---|
| committer | Matthieu Napoli <matthieu@mnapoli.fr> | 2014-10-20 04:48:53 +0400 |
| commit | cc5405970b2206b24db4b7e348dfa1eb130b78d7 (patch) | |
| tree | 2b69dd51110e472557f075b2f7234eaeaf3a7ad9 /tests | |
| parent | 3fb3cd08da0110b6fc94088f3fa44a4587347a23 (diff) | |
| parent | f1030c5f86b5b3226a01db9c0e1b697e7e888e15 (diff) | |
Merge branch 'master' into bugfix/6156
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/travis/initiate_ui_tests.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/travis/initiate_ui_tests.sh b/tests/travis/initiate_ui_tests.sh index c3efd8af09..f9c1559ce6 100755 --- a/tests/travis/initiate_ui_tests.sh +++ b/tests/travis/initiate_ui_tests.sh @@ -1,7 +1,7 @@ #!/bin/bash # initiate UI tests before starting system tests for php 5.5 -if [ "$TEST_SUITE" != "SystemTests" ] || [[ "$TRAVIS_PHP_VERSION" != 5\.4* ]]; then +if [ "$TEST_SUITE" != "SystemTests" ] || [[ "$TRAVIS_PHP_VERSION" != 5\.6* ]]; then echo "Not initiating UI tests (\$TEST_SUITE = $TEST_SUITE, \$TRAVIS_PHP_VERSION = $TRAVIS_PHP_VERSION)." exit fi |