Merge remote-tracking branch 'naderman/ticket/10492' into develop-olympus

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

View file

@ -13,6 +13,10 @@
<testsuites> <testsuites>
<testsuite name="phpBB Test Suite"> <testsuite name="phpBB Test Suite">
<directory suffix="_test.php">../tests/</directory> <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> </testsuite>
</testsuites> </testsuites>

View file

@ -13,6 +13,10 @@
<testsuites> <testsuites>
<testsuite name="phpBB Test Suite"> <testsuite name="phpBB Test Suite">
<directory suffix="_test.php">../tests/</directory> <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> </testsuite>
</testsuites> </testsuites>