diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-07-14 16:51:46 -0400 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-07-14 16:51:46 -0400 |
| commit | bc6122b64ffb5c13c26991f78346fdc7dee6f9f0 (patch) | |
| tree | 31673423cd6ab751bc8b102c97e89a182a94e219 /phpunit.xml.functional | |
| parent | 79dd44061bbfeab64dd2ff7b40541612c219c33c (diff) | |
| parent | 1891e24ea6f5b8d5944535479182e70119b2979f (diff) | |
| download | forums-bc6122b64ffb5c13c26991f78346fdc7dee6f9f0.tar forums-bc6122b64ffb5c13c26991f78346fdc7dee6f9f0.tar.gz forums-bc6122b64ffb5c13c26991f78346fdc7dee6f9f0.tar.bz2 forums-bc6122b64ffb5c13c26991f78346fdc7dee6f9f0.tar.xz forums-bc6122b64ffb5c13c26991f78346fdc7dee6f9f0.zip | |
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11531
Diffstat (limited to 'phpunit.xml.functional')
| -rw-r--r-- | phpunit.xml.functional | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/phpunit.xml.functional b/phpunit.xml.functional index 99f11477aa..cd9cc8771f 100644 --- a/phpunit.xml.functional +++ b/phpunit.xml.functional @@ -14,6 +14,10 @@ <testsuites> <testsuite name="phpBB Test Suite"> <directory suffix="_test.php">./tests/</directory> + <exclude>tests/lint_test.php</exclude> + </testsuite> + <testsuite name="phpBB Lint Test"> + <file>tests/lint_test.php</file> </testsuite> </testsuites> @@ -29,9 +33,10 @@ </blacklist> <whitelist> <directory suffix=".php">./phpBB/includes/</directory> + <directory suffix=".php">./phpBB/phpbb/</directory> <exclude> - <file>./phpBB/includes/search/fulltext_native.php</file> - <file>./phpBB/includes/search/fulltext_mysql.php</file> + <file>./phpBB/phpbb/search/fulltext_native.php</file> + <file>./phpBB/phpbb/search/fulltext_mysql.php</file> <directory suffix=".php">./phpBB/includes/captcha/</directory> </exclude> </whitelist> |