makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-olympus' into develop

Browse source 
* 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
commit 1fd2795cf0
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
travis/phpunit-mysql-travis.xml
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>

4
travis/phpunit-postgres-travis.xml
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>