aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-11-17 22:47:58 +0100
committerJoas Schilling <nickvergessen@gmx.de>2014-11-17 22:47:58 +0100
commitc09c95599b1772aba3754cb451422cb1eb7fa139 (patch)
treea7bfe6678f4fa8e04ccef8a4cd0e47cb1a5427e0
parent6104be6b4d37f6ce569fde95c88400724dabac13 (diff)
parentf261c748b6214541373f955b990354c9b6cc0677 (diff)
downloadforums-c09c95599b1772aba3754cb451422cb1eb7fa139.tar
forums-c09c95599b1772aba3754cb451422cb1eb7fa139.tar.gz
forums-c09c95599b1772aba3754cb451422cb1eb7fa139.tar.bz2
forums-c09c95599b1772aba3754cb451422cb1eb7fa139.tar.xz
forums-c09c95599b1772aba3754cb451422cb1eb7fa139.zip
Merge branch 'develop-ascraeus' into develop
-rw-r--r--phpunit.xml.dist6
1 files changed, 0 insertions, 6 deletions
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index bcc63d6fd9..c6e539b7ba 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -37,15 +37,9 @@
</groups>
<filter>
- <blacklist>
- <directory>./tests</directory>
- </blacklist>
<whitelist>
<directory suffix=".php">./phpBB/includes/</directory>
<directory suffix=".php">./phpBB/phpbb/</directory>
- <exclude>
- <directory suffix=".php">./phpBB/includes/captcha/</directory>
- </exclude>
</whitelist>
</filter>
</phpunit>