diff options
Diffstat (limited to 'travis')
-rw-r--r-- | travis/phpunit-mariadb-travis.xml | 8 | ||||
-rw-r--r-- | travis/phpunit-mysql-travis.xml | 46 | ||||
-rw-r--r-- | travis/phpunit-mysqli-travis.xml | 8 | ||||
-rw-r--r-- | travis/phpunit-postgres-travis.xml | 8 | ||||
-rw-r--r-- | travis/phpunit-sqlite3-travis.xml | 8 | ||||
-rwxr-xr-x | travis/setup-database.sh | 2 | ||||
-rwxr-xr-x | travis/setup-php-extensions.sh | 13 |
7 files changed, 16 insertions, 77 deletions
diff --git a/travis/phpunit-mariadb-travis.xml b/travis/phpunit-mariadb-travis.xml index 53a206b9b0..35ade72d4e 100644 --- a/travis/phpunit-mariadb-travis.xml +++ b/travis/phpunit-mariadb-travis.xml @@ -1,14 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <phpunit backupGlobals="true" - backupStaticAttributes="true" + backupStaticAttributes="false" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" - syntaxCheck="true" - strict="true" verbose="true" bootstrap="../tests/bootstrap.php"> <testsuites> @@ -19,10 +17,10 @@ <exclude>../tests/ui</exclude> </testsuite> <testsuite name="phpBB Functional Tests"> - <directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/functional</directory> + <directory suffix="_test.php">../tests/functional</directory> </testsuite> <testsuite name="phpBB UI Tests"> - <directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/ui</directory> + <directory suffix="_test.php">../tests/ui</directory> </testsuite> </testsuites> diff --git a/travis/phpunit-mysql-travis.xml b/travis/phpunit-mysql-travis.xml deleted file mode 100644 index d0d3e3c0c0..0000000000 --- a/travis/phpunit-mysql-travis.xml +++ /dev/null @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<phpunit backupGlobals="true" - backupStaticAttributes="true" - colors="true" - convertErrorsToExceptions="true" - convertNoticesToExceptions="true" - convertWarningsToExceptions="true" - processIsolation="false" - stopOnFailure="false" - syntaxCheck="true" - strict="true" - verbose="true" - bootstrap="../tests/bootstrap.php"> - <testsuites> - <testsuite name="phpBB Test Suite"> - <directory suffix="_test.php">../tests</directory> - <exclude>../tests/functional</exclude> - <exclude>../tests/lint_test.php</exclude> - <exclude>../tests/ui</exclude> - </testsuite> - <testsuite name="phpBB Functional Tests"> - <directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/functional</directory> - </testsuite> - <testsuite name="phpBB UI Tests"> - <directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/ui</directory> - </testsuite> - </testsuites> - - <groups> - <exclude> - <group>slow</group> - </exclude> - </groups> - - <php> - <server name="PHPBB_TEST_DBMS" value="phpbb\db\driver\mysql" /> - <server name="PHPBB_TEST_DBHOST" value="0.0.0.0" /> - <server name="PHPBB_TEST_DBPORT" value="3306" /> - <server name="PHPBB_TEST_DBNAME" value="phpbb_tests" /> - <server name="PHPBB_TEST_DBUSER" value="root" /> - <server name="PHPBB_TEST_DBPASSWD" value="" /> - <server name="PHPBB_TEST_REDIS_HOST" value="localhost" /> - <server name="PHPBB_TEST_TABLE_PREFIX" value="phpbb_"/> - <server name="PHPBB_FUNCTIONAL_URL" value="http://localhost/" /> - </php> -</phpunit> diff --git a/travis/phpunit-mysqli-travis.xml b/travis/phpunit-mysqli-travis.xml index b12ae6fe8b..d2284086b9 100644 --- a/travis/phpunit-mysqli-travis.xml +++ b/travis/phpunit-mysqli-travis.xml @@ -1,14 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <phpunit backupGlobals="true" - backupStaticAttributes="true" + backupStaticAttributes="false" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" - syntaxCheck="true" - strict="true" verbose="true" bootstrap="../tests/bootstrap.php"> <testsuites> @@ -19,10 +17,10 @@ <exclude>../tests/ui</exclude> </testsuite> <testsuite name="phpBB Functional Tests"> - <directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/functional</directory> + <directory suffix="_test.php">../tests/functional</directory> </testsuite> <testsuite name="phpBB UI Tests"> - <directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/ui</directory> + <directory suffix="_test.php">../tests/ui</directory> </testsuite> </testsuites> diff --git a/travis/phpunit-postgres-travis.xml b/travis/phpunit-postgres-travis.xml index fa497a1264..6faab4d61a 100644 --- a/travis/phpunit-postgres-travis.xml +++ b/travis/phpunit-postgres-travis.xml @@ -1,14 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <phpunit backupGlobals="true" - backupStaticAttributes="true" + backupStaticAttributes="false" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" - syntaxCheck="true" - strict="true" verbose="true" bootstrap="../tests/bootstrap.php"> <testsuites> @@ -19,10 +17,10 @@ <exclude>../tests/ui</exclude> </testsuite> <testsuite name="phpBB Functional Tests"> - <directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/functional</directory> + <directory suffix="_test.php">../tests/functional</directory> </testsuite> <testsuite name="phpBB UI Tests"> - <directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/ui</directory> + <directory suffix="_test.php">../tests/ui</directory> </testsuite> </testsuites> diff --git a/travis/phpunit-sqlite3-travis.xml b/travis/phpunit-sqlite3-travis.xml index 5baab791e0..633963c9fb 100644 --- a/travis/phpunit-sqlite3-travis.xml +++ b/travis/phpunit-sqlite3-travis.xml @@ -1,14 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <phpunit backupGlobals="true" - backupStaticAttributes="true" + backupStaticAttributes="false" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" - syntaxCheck="true" - strict="true" verbose="true" bootstrap="../tests/bootstrap.php"> <testsuites> @@ -19,10 +17,10 @@ <exclude>../tests/ui</exclude> </testsuite> <testsuite name="phpBB Functional Tests"> - <directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/functional</directory> + <directory suffix="_test.php">../tests/functional</directory> </testsuite> <testsuite name="phpBB UI Tests"> - <directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/ui</directory> + <directory suffix="_test.php">../tests/ui</directory> </testsuite> </testsuites> diff --git a/travis/setup-database.sh b/travis/setup-database.sh index 3771f19073..cbd5e93e83 100755 --- a/travis/setup-database.sh +++ b/travis/setup-database.sh @@ -26,7 +26,7 @@ then psql -c 'create database phpbb_tests;' -U postgres fi -if [ "$TRAVIS_PHP_VERSION" == "5.4" -a "$DB" == "mysqli" ] +if [ "$TRAVIS_PHP_VERSION" == "5.6" -a "$DB" == "mysqli" ] then mysql -e 'SET GLOBAL storage_engine=MyISAM;' fi diff --git a/travis/setup-php-extensions.sh b/travis/setup-php-extensions.sh index de27965e39..7d1400c3b3 100755 --- a/travis/setup-php-extensions.sh +++ b/travis/setup-php-extensions.sh @@ -42,16 +42,9 @@ function install_php_extension php_ini_file=$(find_php_ini) -# apc -if [ `php -r "echo (int) version_compare(PHP_VERSION, '5.5.0-dev', '<');"` == "1" ] -then - echo 'Enabling APC PHP extension' - printf "\n" | pecl install apc - echo 'apc.enable_cli=1' >> "$php_ini_file" -else - echo 'Disabling Opcache' - echo 'opcache.enable=0' >> "$php_ini_file" -fi +# Disable opcache for testing +echo 'Disabling Opcache' +echo 'opcache.enable=0' >> "$php_ini_file" # APCu if [ `php -r "echo (int) (version_compare(PHP_VERSION, '7.0.0-dev', '>=') && version_compare(PHP_VERSION, '7.3.0-dev', '<'));"` == "1" ] |