diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-09 11:22:30 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-09 11:22:30 +0200 |
| commit | 3b3f941f5fa5087a3111ddd4603d0f6fa71360ba (patch) | |
| tree | 7b4e98e8f484d0cc28c1cc37341d266ba3da1b58 /phpunit.xml.dist | |
| parent | d4fc060bcd61228fdf78da4f2d290a7a17546c46 (diff) | |
| parent | 333120a9921d8b36914965540d2d513cb939dc51 (diff) | |
| download | forums-3b3f941f5fa5087a3111ddd4603d0f6fa71360ba.tar forums-3b3f941f5fa5087a3111ddd4603d0f6fa71360ba.tar.gz forums-3b3f941f5fa5087a3111ddd4603d0f6fa71360ba.tar.bz2 forums-3b3f941f5fa5087a3111ddd4603d0f6fa71360ba.tar.xz forums-3b3f941f5fa5087a3111ddd4603d0f6fa71360ba.zip | |
Merge branch 'ticket/10839-olympus' into ticket/10839
* ticket/10839-olympus:
[ticket/10839] Fix note about running slow tests and build task
[ticket/10839] Removing phpunit.xml.all
[ticket/10839] Always run functional tests by default
Conflicts:
phpunit.xml.dist
Diffstat (limited to 'phpunit.xml.dist')
| -rw-r--r-- | phpunit.xml.dist | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/phpunit.xml.dist b/phpunit.xml.dist index dd039fb567..e65fdb3938 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -17,6 +17,9 @@ <exclude>./tests/functional</exclude> <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> @@ -24,7 +27,6 @@ <groups> <exclude> - <group>functional</group> <group>slow</group> </exclude> </groups> |