diff options
| author | Matthieu Napoli <matthieu@mnapoli.fr> | 2014-10-20 03:14:28 +0400 |
|---|---|---|
| committer | Matthieu Napoli <matthieu@mnapoli.fr> | 2014-10-20 03:14:28 +0400 |
| commit | 3fb3cd08da0110b6fc94088f3fa44a4587347a23 (patch) | |
| tree | 22dc0a6e0bfaeb27a1fa413906267235d33a546a /tests/travis | |
| parent | 70adbfc090095e8ed80a6a0f1dcc9623d4cc1127 (diff) | |
| parent | de8e60b4432b6dfc91f5a5d68dd1d7a72e07484a (diff) | |
Merge branch 'master' into bugfix/6156
Diffstat (limited to 'tests/travis')
| -rwxr-xr-x | tests/travis/initiate_ui_tests.sh | 4 | ||||
| -rw-r--r-- | tests/travis/php-fpm.ini | 1 |
2 files changed, 3 insertions, 2 deletions
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 diff --git a/tests/travis/php-fpm.ini b/tests/travis/php-fpm.ini index e592e6638f..b79aaa4b65 100644 --- a/tests/travis/php-fpm.ini +++ b/tests/travis/php-fpm.ini @@ -9,3 +9,4 @@ pm = static pm.max_children = 2 php_admin_value[memory_limit] = 128M +php_admin_value[always_populate_raw_post_data] = -1 |