diff options
| author | Thomas Steur <thomas.steur@googlemail.com> | 2014-10-20 02:08:21 +0400 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@googlemail.com> | 2014-10-20 02:08:21 +0400 |
| commit | a3063de9f47ac76df1804354cf08791846bddefb (patch) | |
| tree | da00ce1aa7892d1d074963f65ab2d14a8d6cf451 /tests | |
| parent | 6c0ac550b7559e1cd81165a458910770c2913c31 (diff) | |
| parent | 13a4ae049a1a75a33e0218c5fdb8b5f99521dc2a (diff) | |
Merge branch 'master' of github.com:piwik/piwik
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/resources/OmniFixture-dump.sql.gz | bin | 657053 -> 651784 bytes | |||
| -rwxr-xr-x | tests/travis/initiate_ui_tests.sh | 4 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/resources/OmniFixture-dump.sql.gz b/tests/resources/OmniFixture-dump.sql.gz Binary files differindex 5fed52684e..f1f56e6d9b 100644 --- a/tests/resources/OmniFixture-dump.sql.gz +++ b/tests/resources/OmniFixture-dump.sql.gz diff --git a/tests/travis/initiate_ui_tests.sh b/tests/travis/initiate_ui_tests.sh index 3dc5a3d9b1..c3efd8af09 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\.5* ]]; then +if [ "$TEST_SUITE" != "SystemTests" ] || [[ "$TRAVIS_PHP_VERSION" != 5\.4* ]]; then echo "Not initiating UI tests (\$TEST_SUITE = $TEST_SUITE, \$TRAVIS_PHP_VERSION = $TRAVIS_PHP_VERSION)." exit fi @@ -29,4 +29,4 @@ git remote set-url origin "https://piwik-auto-commit-bot:$PIWIK_AUTOMATION@githu if ! git push origin $UI_BRANCH 2> /dev/null; then echo "Failed to push!" exit 1 -fi
\ No newline at end of file +fi |