aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-05-09 11:07:52 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-05-09 11:19:48 +0200
commitd6ac4a1130721638ec76756ae0dd7b72136383c1 (patch)
treee35697b5b39c9c2e4f3f3bd93593f08250988679 /phpunit.xml.dist
parentMerge pull request #2396 from Nicofuma/ticket/12485 (diff)
downloadphpbb-d6ac4a1130721638ec76756ae0dd7b72136383c1.tar.gz
phpbb-d6ac4a1130721638ec76756ae0dd7b72136383c1.tar.bz2
phpbb-d6ac4a1130721638ec76756ae0dd7b72136383c1.zip
[ticket/10839] Always run functional tests by default
They are skipped anyway, if $phpbb_functional_url is not configured. If you want to run tests without functional tests, just append --exclude-group functional to your call PHPBB3-10839
Diffstat (limited to 'phpunit.xml.dist')
-rw-r--r--phpunit.xml.dist9
1 files changed, 4 insertions, 5 deletions
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index f5871e2eeb..c4906e42fe 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -15,19 +15,18 @@
<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>
+ <exclude>./tests/lint_test.php</exclude>
</testsuite>
<testsuite name="phpBB Functional Tests">
<directory suffix="_test.php" phpVersion="5.3.0" phpVersionOperator=">=">./tests/functional</directory>
</testsuite>
+ <testsuite name="phpBB Lint Test">
+ <file>./tests/lint_test.php</file>
+ </testsuite>
</testsuites>
<groups>
<exclude>
- <group>functional</group>
<group>slow</group>
</exclude>
</groups>