aboutsummaryrefslogtreecommitdiffstats
path: root/phpunit.xml.all
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2011-10-17 16:35:10 +0200
committerAndreas Fischer <bantu@phpbb.com>2011-10-17 16:35:10 +0200
commitaf11d94fb01e35445b3bf15a8d1fdbeb2e51fef4 (patch)
tree43b41002184c70102d294f670c485b0ff07cf251 /phpunit.xml.all
parent2d42dbc385c500e185059d1b503cc0c35ca71a0f (diff)
parent9c861a0350ae67f06a38ee6efc890412a32751f4 (diff)
downloadforums-af11d94fb01e35445b3bf15a8d1fdbeb2e51fef4.tar
forums-af11d94fb01e35445b3bf15a8d1fdbeb2e51fef4.tar.gz
forums-af11d94fb01e35445b3bf15a8d1fdbeb2e51fef4.tar.bz2
forums-af11d94fb01e35445b3bf15a8d1fdbeb2e51fef4.tar.xz
forums-af11d94fb01e35445b3bf15a8d1fdbeb2e51fef4.zip
Merge remote-tracking branch 'naderman/ticket/10414' into develop
* naderman/ticket/10414: [ticket/10414] Skip functional tests on PHP 5.2 - requires PHPUnit 3.6 on 5.2
Diffstat (limited to 'phpunit.xml.all')
-rw-r--r--phpunit.xml.all4
1 files changed, 4 insertions, 0 deletions
diff --git a/phpunit.xml.all b/phpunit.xml.all
index fde3bbb1a7..b835a38c20 100644
--- a/phpunit.xml.all
+++ b/phpunit.xml.all
@@ -14,6 +14,10 @@
<testsuites>
<testsuite name="phpBB Test Suite">
<directory suffix="_test.php">./tests/</directory>
+ <exclude>./tests/functional</exclude>
+ </testsuite>
+ <testsuite name="phpBB Functional Tests">
+ <directory suffix="_test.php" phpVersion="5.3.0" phpVersionOperator=">=">./tests/functional</directory>
</testsuite>
</testsuites>