aboutsummaryrefslogtreecommitdiffstats
path: root/travis
diff options
context:
space:
mode:
Diffstat (limited to 'travis')
-rwxr-xr-xtravis/check-executable-files.sh4
-rw-r--r--travis/phpunit-mariadb-travis.xml8
-rw-r--r--travis/phpunit-mysql-travis.xml46
-rw-r--r--travis/phpunit-mysqli-travis.xml8
-rw-r--r--travis/phpunit-postgres-travis.xml8
-rw-r--r--travis/phpunit-sqlite3-travis.xml8
-rwxr-xr-xtravis/setup-database.sh4
-rwxr-xr-xtravis/setup-mariadb.sh5
-rwxr-xr-xtravis/setup-php-extensions.sh13
9 files changed, 22 insertions, 82 deletions
diff --git a/travis/check-executable-files.sh b/travis/check-executable-files.sh
index 1aa8dca073..6899373c1e 100755
--- a/travis/check-executable-files.sh
+++ b/travis/check-executable-files.sh
@@ -48,13 +48,13 @@ then
'(' \
${executable_files} \
')' -a \
- -not -perm +100 \
+ -not -perm /100 \
')' -o \
'(' \
-not '(' \
${executable_files} \
')' -a \
- -perm +111 \
+ -perm /111 \
')' \
')' \
')' \
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..b581ddfccb 100755
--- a/travis/setup-database.sh
+++ b/travis/setup-database.sh
@@ -26,12 +26,12 @@ 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
-if [ "$DB" == "mysql" -o "$DB" == "mysqli" -o "$DB" == "mariadb" ]
+if [ "$DB" == "mysqli" -o "$DB" == "mariadb" ]
then
mysql -e 'create database IF NOT EXISTS phpbb_tests;'
fi
diff --git a/travis/setup-mariadb.sh b/travis/setup-mariadb.sh
index 95445dcc55..2efe99cc2d 100755
--- a/travis/setup-mariadb.sh
+++ b/travis/setup-mariadb.sh
@@ -12,13 +12,14 @@ set -e
set -x
# MariaDB Series
-VERSION='10.0'
+VERSION='10.1'
# Operating system codename, e.g. "precise"
OS_CODENAME=$(lsb_release --codename --short)
# Manually purge MySQL to remove conflicting files (e.g. /etc/mysql/my.cnf)
sudo apt-get purge -y mysql-common
+sudo rm -rf /etc/mysql && sudo rm -rf /var/log/mysql && sudo rm -rf /var/lib/mysql && sudo rm -rf /var/lib/mysql-files && sudo rm -rf /var/lib/mysql-keyring
if ! which add-apt-repository > /dev/null
then
@@ -27,7 +28,7 @@ then
fi
MIRROR_DOMAIN='ftp.osuosl.org'
-sudo apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 0xcbcb082a1bb943db
+sudo apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 0xF1656F24C74CD1D8
sudo add-apt-repository "deb http://$MIRROR_DOMAIN/pub/mariadb/repo/$VERSION/ubuntu $OS_CODENAME main"
sudo apt-get update
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" ]
generated by cgit v1.2.1 (git 2.21.0) at 2025-12-02 09:52:33 +0000