aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2015-10-14 10:41:06 +0200
committerMarc Alexander <admin@m-a-styles.de>2015-10-14 10:41:06 +0200
commitccb3d0ac78db25f60983e1c3211f0220cbee93f8 (patch)
tree4bdec233c7ccd1ae7b62762ba15362b10cea693f
parent657216475468051464b25e12160f1749a71c1cf9 (diff)
parent345e8ad8222d8ca331c84b96fe2de1b5c0a5ac6f (diff)
downloadforums-ccb3d0ac78db25f60983e1c3211f0220cbee93f8.tar
forums-ccb3d0ac78db25f60983e1c3211f0220cbee93f8.tar.gz
forums-ccb3d0ac78db25f60983e1c3211f0220cbee93f8.tar.bz2
forums-ccb3d0ac78db25f60983e1c3211f0220cbee93f8.tar.xz
forums-ccb3d0ac78db25f60983e1c3211f0220cbee93f8.zip
Merge pull request #3973 from Nicofuma/ticket/14236
[ticket/14236] Disable Opcache on Travis when running the tests
-rw-r--r--.travis.yml2
-rwxr-xr-xtravis/setup-php-extensions.sh3
2 files changed, 4 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 2542898324..a91a95b3c7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -50,4 +50,4 @@ script:
- sh -c "if [ '$SLOWTESTS' != '1' ]; then phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml; fi"
- sh -c "if [ '$SLOWTESTS' = '1' ]; then phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml --group slow; fi"
- sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.3.3' -a '$DB' = 'mysqli' -a '$TRAVIS_PULL_REQUEST' != 'false' ]; then git-tools/commit-msg-hook-range.sh origin/$TRAVIS_BRANCH..FETCH_HEAD; fi"
-
+ - php -i | grep opcache
diff --git a/travis/setup-php-extensions.sh b/travis/setup-php-extensions.sh
index c0defe44ef..d9544858b7 100755
--- a/travis/setup-php-extensions.sh
+++ b/travis/setup-php-extensions.sh
@@ -48,6 +48,9 @@ then
echo 'Enabling APC PHP extension'
register_php_extension 'apc' "$php_ini_file"
echo 'apc.enable_cli=1' >> "$php_ini_file"
+else
+ echo 'Disabling Opcache'
+ echo 'opcache.enable=0' >> "$php_ini_file"
fi
# redis