1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-16 06:36:39 +02:00

Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/10492] Skip functional tests on PHP 5.2 on travis
This commit is contained in:
Andreas Fischer
2012-05-11 15:47:46 +02:00
2 changed files with 8 additions and 0 deletions

View File

@ -13,6 +13,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>

View File

@ -13,6 +13,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>