diff options
| author |   Joas Schilling <nickvergessen@gmx.de> | 2014-05-03 10:28:15 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-03 10:28:15 +0200 |
| commit | 3b823465db93cf525249d00a412d5417b3216b83 (patch) | |
| tree | f2ec484d4aec0408505e3ab4881582b3ffe33949 /phpunit.xml.dist | |
| parent | Merge remote-tracking branch 'VSEphpbb/ticket/10521' into develop-ascraeus (diff) | |
| parent | Merge pull request #2396 from Nicofuma/ticket/12485 (diff) | |
| download | phpbb-3b823465db93cf525249d00a412d5417b3216b83.tar.gz phpbb-3b823465db93cf525249d00a412d5417b3216b83.tar.bz2 phpbb-3b823465db93cf525249d00a412d5417b3216b83.zip | |
Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
[ticket/12485] Broken tests due to absolute exclude
Conflicts:
.travis.yml
phpunit.xml.all
phpunit.xml.dist
phpunit.xml.functional
Diffstat (limited to 'phpunit.xml.dist')
| -rw-r--r-- | phpunit.xml.dist | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 700af8b2b2..dd039fb567 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -13,11 +13,12 @@ > <testsuites> <testsuite name="phpBB Test Suite"> - <directory suffix="_test.php">./tests/</directory> - <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> </testsuites> @@ -30,7 +31,7 @@ <filter> <blacklist> - <directory>./tests/</directory> + <directory>./tests</directory> </blacklist> <whitelist> <directory suffix=".php">./phpBB/includes/</directory> |