makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-olympus' into develop-ascraeus

Browse source 
* develop-olympus:
  [ticket/12485] Broken tests due to absolute exclude

Conflicts:
	.travis.yml
	phpunit.xml.all
	phpunit.xml.dist
	phpunit.xml.functional
This commit is contained in:
Joas Schilling 2014-05-03 10:28:15 +02:00
commit 3b823465db
7 changed files with 27 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
phpunit.xml.all
View file

@ -13,17 +13,17 @@
> >
<testsuites> <testsuites>
<testsuite name="phpBB Test Suite"> <testsuite name="phpBB Test Suite">
<directory suffix="_test.php">./tests/</directory> <directory suffix="_test.php">./tests</directory>
<exclude>tests/lint_test.php</exclude> <exclude>./tests/lint_test.php</exclude>
</testsuite> </testsuite>
<testsuite name="phpBB Lint Test"> <testsuite name="phpBB Lint Test">
<file>tests/lint_test.php</file> <file>./tests/lint_test.php</file>
</testsuite> </testsuite>
</testsuites> </testsuites>
<filter> <filter>
<blacklist> <blacklist>
<directory>./tests/</directory> <directory>./tests</directory>
</blacklist> </blacklist>
<whitelist> <whitelist>
<directory suffix=".php">./phpBB/includes/</directory> <directory suffix=".php">./phpBB/includes/</directory>

9
phpunit.xml.dist
View file

@ -13,11 +13,12 @@
> >
<testsuites> <testsuites>
<testsuite name="phpBB Test Suite"> <testsuite name="phpBB Test Suite">
<directory suffix="_test.php">./tests/</directory> <directory suffix="_test.php">./tests</directory>
<exclude>tests/lint_test.php</exclude> <exclude>./tests/functional</exclude>
<exclude>./tests/lint_test.php</exclude>
</testsuite> </testsuite>
<testsuite name="phpBB Lint Test"> <testsuite name="phpBB Lint Test">
<file>tests/lint_test.php</file> <file>./tests/lint_test.php</file>
</testsuite> </testsuite>
</testsuites> </testsuites>
@ -30,7 +31,7 @@
<filter> <filter>
<blacklist> <blacklist>
<directory>./tests/</directory> <directory>./tests</directory>
</blacklist> </blacklist>
<whitelist> <whitelist>
<directory suffix=".php">./phpBB/includes/</directory> <directory suffix=".php">./phpBB/includes/</directory>

9
phpunit.xml.functional
View file

@ -13,11 +13,12 @@
> >
<testsuites> <testsuites>
<testsuite name="phpBB Test Suite"> <testsuite name="phpBB Test Suite">
<directory suffix="_test.php">./tests/</directory> <directory suffix="_test.php">./tests</directory>
<exclude>tests/lint_test.php</exclude> <exclude>./tests/functional</exclude>
<exclude>./tests/lint_test.php</exclude>
</testsuite> </testsuite>
<testsuite name="phpBB Lint Test"> <testsuite name="phpBB Lint Test">
<file>tests/lint_test.php</file> <file>./tests/lint_test.php</file>
</testsuite> </testsuite>
</testsuites> </testsuites>
@ -29,7 +30,7 @@
<filter> <filter>
<blacklist> <blacklist>
<directory>./tests/</directory> <directory>./tests</directory>
</blacklist> </blacklist>
<whitelist> <whitelist>
<directory suffix=".php">./phpBB/includes/</directory> <directory suffix=".php">./phpBB/includes/</directory>

6
travis/phpunit-mariadb-travis.xml
View file

@ -13,9 +13,9 @@
bootstrap="../tests/bootstrap.php"> bootstrap="../tests/bootstrap.php">
<testsuites> <testsuites>
<testsuite name="phpBB Test Suite"> <testsuite name="phpBB Test Suite">
<directory suffix="_test.php">../tests/</directory> <directory suffix="_test.php">../tests</directory>
<exclude>tests/functional</exclude> <exclude>../tests/functional</exclude>
<exclude>tests/lint_test.php</exclude> <exclude>../tests/lint_test.php</exclude>
</testsuite> </testsuite>
<testsuite name="phpBB Functional Tests"> <testsuite name="phpBB Functional Tests">
<directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/functional</directory> <directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/functional</directory>

8
travis/phpunit-mysql-travis.xml
View file

@ -13,12 +13,12 @@
bootstrap="../tests/bootstrap.php"> bootstrap="../tests/bootstrap.php">
<testsuites> <testsuites>
<testsuite name="phpBB Test Suite"> <testsuite name="phpBB Test Suite">
<directory suffix="_test.php">../tests/</directory> <directory suffix="_test.php">../tests</directory>
<exclude>tests/functional</exclude> <exclude>../tests/functional</exclude>
<exclude>tests/lint_test.php</exclude> <exclude>../tests/lint_test.php</exclude>
</testsuite> </testsuite>
<testsuite name="phpBB Lint Test"> <testsuite name="phpBB Lint Test">
<file>tests/lint_test.php</file> <file>../tests/lint_test.php</file>
</testsuite> </testsuite>
<testsuite name="phpBB Functional Tests"> <testsuite name="phpBB Functional Tests">
<directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/functional</directory> <directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/functional</directory>

6
travis/phpunit-postgres-travis.xml
View file

@ -13,9 +13,9 @@
bootstrap="../tests/bootstrap.php"> bootstrap="../tests/bootstrap.php">
<testsuites> <testsuites>
<testsuite name="phpBB Test Suite"> <testsuite name="phpBB Test Suite">
<directory suffix="_test.php">../tests/</directory> <directory suffix="_test.php">../tests</directory>
<exclude>tests/functional</exclude> <exclude>../tests/functional</exclude>
<exclude>tests/lint_test.php</exclude> <exclude>../tests/lint_test.php</exclude>
</testsuite> </testsuite>
<testsuite name="phpBB Functional Tests"> <testsuite name="phpBB Functional Tests">
<directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/functional</directory> <directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/functional</directory>

6
travis/phpunit-sqlite3-travis.xml
View file

@ -13,9 +13,9 @@
bootstrap="../tests/bootstrap.php"> bootstrap="../tests/bootstrap.php">
<testsuites> <testsuites>
<testsuite name="phpBB Test Suite"> <testsuite name="phpBB Test Suite">
<directory suffix="_test.php">../tests/</directory> <directory suffix="_test.php">../tests</directory>
<exclude>tests/functional</exclude> <exclude>../tests/functional</exclude>
<exclude>tests/lint_test.php</exclude> <exclude>../tests/lint_test.php</exclude>
</testsuite> </testsuite>
<testsuite name="phpBB Functional Tests"> <testsuite name="phpBB Functional Tests">
<directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/functional</directory> <directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/functional</directory>