aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicofuma <github@nicofuma.fr>2014-05-03 03:36:01 +0200
committerNicofuma <github@nicofuma.fr>2014-05-03 04:05:25 +0200
commit3dee1db2603c84b53c9fe93b5da95d75846878d6 (patch)
tree41fd466903f59f47d4e0f849f9735d4c43cb5a72
parentaf7ec71967102a0ec591ad4f0da704b58a44fe8b (diff)
downloadforums-3dee1db2603c84b53c9fe93b5da95d75846878d6.tar
forums-3dee1db2603c84b53c9fe93b5da95d75846878d6.tar.gz
forums-3dee1db2603c84b53c9fe93b5da95d75846878d6.tar.bz2
forums-3dee1db2603c84b53c9fe93b5da95d75846878d6.tar.xz
forums-3dee1db2603c84b53c9fe93b5da95d75846878d6.zip
[ticket/12485] Broken tests due to absolute exclude
PHPBB3-12485
Diffstat
-rw-r--r--.travis.yml2
-rw-r--r--phpunit.xml.all4
-rw-r--r--phpunit.xml.dist4
-rw-r--r--phpunit.xml.functional4
-rw-r--r--travis/phpunit-mariadb-travis.xml6
-rw-r--r--travis/phpunit-mysql-5-2-travis.xml44
-rw-r--r--travis/phpunit-mysql-travis.xml8
-rw-r--r--travis/phpunit-postgres-travis.xml6
8 files changed, 61 insertions, 17 deletions
diff --git a/.travis.yml b/.travis.yml
index 635023d596..26744c57ef 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,7 +24,7 @@ before_script:
- sh -c "if [ `php -r "echo (int) version_compare(PHP_VERSION, '5.3.19', '>=');"` = "1" ]; then travis/setup-webserver.sh; fi"
script:
- - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.2' ]; then phpunit --configuration travis/phpunit-$DB-travis.xml; else phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml; fi"
+ - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.2' ]; then phpunit --configuration travis/phpunit-$DB-5-2-travis.xml; else phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml; fi"
- sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.5' -a '$DB' = 'mysql' -a '$TRAVIS_PULL_REQUEST' != 'false' ]; then git-tools/commit-msg-hook-range.sh origin/$TRAVIS_BRANCH..FETCH_HEAD; fi"
matrix:
diff --git a/phpunit.xml.all b/phpunit.xml.all
index d91a614c97..b73b8873f6 100644
--- a/phpunit.xml.all
+++ b/phpunit.xml.all
@@ -13,7 +13,7 @@
>
<testsuites>
<testsuite name="phpBB Test Suite">
- <directory suffix="_test.php">./tests/</directory>
+ <directory suffix="_test.php">./tests</directory>
<exclude>./tests/functional</exclude>
<exclude>tests/lint_test.php</exclude>
</testsuite>
@@ -27,7 +27,7 @@
<filter>
<blacklist>
- <directory>./tests/</directory>
+ <directory>./tests</directory>
</blacklist>
</filter>
</phpunit>
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 4c91f8e373..f5871e2eeb 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -13,7 +13,7 @@
>
<testsuites>
<testsuite name="phpBB Test Suite">
- <directory suffix="_test.php">./tests/</directory>
+ <directory suffix="_test.php">./tests</directory>
<exclude>./tests/functional</exclude>
<exclude>tests/lint_test.php</exclude>
</testsuite>
@@ -34,7 +34,7 @@
<filter>
<blacklist>
- <directory>./tests/</directory>
+ <directory>./tests</directory>
</blacklist>
</filter>
</phpunit>
diff --git a/phpunit.xml.functional b/phpunit.xml.functional
index 919de74dec..9f3033b074 100644
--- a/phpunit.xml.functional
+++ b/phpunit.xml.functional
@@ -13,7 +13,7 @@
>
<testsuites>
<testsuite name="phpBB Test Suite">
- <directory suffix="_test.php">./tests/</directory>
+ <directory suffix="_test.php">./tests</directory>
<exclude>./tests/functional</exclude>
<exclude>tests/lint_test.php</exclude>
</testsuite>
@@ -33,7 +33,7 @@
<filter>
<blacklist>
- <directory>./tests/</directory>
+ <directory>./tests</directory>
</blacklist>
</filter>
</phpunit>
diff --git a/travis/phpunit-mariadb-travis.xml b/travis/phpunit-mariadb-travis.xml
index 1eaee5b7d8..aa245a8224 100644
--- a/travis/phpunit-mariadb-travis.xml
+++ b/travis/phpunit-mariadb-travis.xml
@@ -13,9 +13,9 @@
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>
+ <directory suffix="_test.php">../tests</directory>
+ <exclude>../tests/functional</exclude>
+ <exclude>../tests/lint_test.php</exclude>
</testsuite>
<testsuite name="phpBB Functional Tests">
<directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/functional</directory>
diff --git a/travis/phpunit-mysql-5-2-travis.xml b/travis/phpunit-mysql-5-2-travis.xml
new file mode 100644
index 0000000000..e99f8d6cee
--- /dev/null
+++ b/travis/phpunit-mysql-5-2-travis.xml
@@ -0,0 +1,44 @@
+<?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>
+ </testsuite>
+ <testsuite name="phpBB Lint Test">
+ <file>tests/lint_test.php</file>
+ </testsuite>
+ <testsuite name="phpBB Functional Tests">
+ <directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/functional</directory>
+ </testsuite>
+ </testsuites>
+
+ <groups>
+ <exclude>
+ <group>slow</group>
+ </exclude>
+ </groups>
+
+ <php>
+ <server name="PHPBB_TEST_DBMS" value="mysqli" />
+ <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_TABLE_PREFIX" value="phpbb_"/>
+ <server name="PHPBB_FUNCTIONAL_URL" value="http://localhost/" />
+ </php>
+</phpunit>
diff --git a/travis/phpunit-mysql-travis.xml b/travis/phpunit-mysql-travis.xml
index e99f8d6cee..3ad59747ff 100644
--- a/travis/phpunit-mysql-travis.xml
+++ b/travis/phpunit-mysql-travis.xml
@@ -13,12 +13,12 @@
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>
+ <directory suffix="_test.php">../tests</directory>
+ <exclude>../tests/functional</exclude>
+ <exclude>../tests/lint_test.php</exclude>
</testsuite>
<testsuite name="phpBB Lint Test">
- <file>tests/lint_test.php</file>
+ <file>../tests/lint_test.php</file>
</testsuite>
<testsuite name="phpBB Functional Tests">
<directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/functional</directory>
diff --git a/travis/phpunit-postgres-travis.xml b/travis/phpunit-postgres-travis.xml
index aa829f4d30..b4af7c5765 100644
--- a/travis/phpunit-postgres-travis.xml
+++ b/travis/phpunit-postgres-travis.xml
@@ -13,9 +13,9 @@
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>
+ <directory suffix="_test.php">../tests</directory>
+ <exclude>../tests/functional</exclude>
+ <exclude>../tests/lint_test.php</exclude>
</testsuite>
<testsuite name="phpBB Functional Tests">
<directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/functional</directory>
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-10 12:06:13 +0000