diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-05-11 15:47:37 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-05-11 15:47:37 +0200 |
| commit | 8861e26034beb9367d1f1fd006ea83852951c6f6 (patch) | |
| tree | e455cfc05b76f24ed733cd17340784f1733a77a7 | |
| parent | b0e273b95f4e668d0716eba5ebcd11c2e642ea03 (diff) | |
| parent | 1960629240679965ca22a98e69973dcfe2e05476 (diff) | |
| download | forums-8861e26034beb9367d1f1fd006ea83852951c6f6.tar forums-8861e26034beb9367d1f1fd006ea83852951c6f6.tar.gz forums-8861e26034beb9367d1f1fd006ea83852951c6f6.tar.bz2 forums-8861e26034beb9367d1f1fd006ea83852951c6f6.tar.xz forums-8861e26034beb9367d1f1fd006ea83852951c6f6.zip | |
Merge remote-tracking branch 'naderman/ticket/10492' into develop-olympus
* naderman/ticket/10492:
[ticket/10492] Skip functional tests on PHP 5.2 on travis
| -rw-r--r-- | travis/phpunit-mysql-travis.xml | 4 | ||||
| -rw-r--r-- | travis/phpunit-postgres-travis.xml | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/travis/phpunit-mysql-travis.xml b/travis/phpunit-mysql-travis.xml index 36845a7f71..e54b2bb77b 100644 --- a/travis/phpunit-mysql-travis.xml +++ b/travis/phpunit-mysql-travis.xml @@ -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> diff --git a/travis/phpunit-postgres-travis.xml b/travis/phpunit-postgres-travis.xml index 461a53bcb1..55ba996548 100644 --- a/travis/phpunit-postgres-travis.xml +++ b/travis/phpunit-postgres-travis.xml @@ -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> |