mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 05:50:42 +02:00
Code Issues Releases Wiki Activity

Merge branch 'ticket/10839-olympus' into ticket/10839

Browse Source 
* 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
This commit is contained in:
Joas Schilling
2014-05-09 11:22:30 +02:00
parent d4fc060bcd 333120a992
commit 3b3f941f5f
5 changed files with 12 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpunit.xml.dist
View File

@@ -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>