diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-03-22 16:36:06 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-03-22 16:36:06 +0100 |
| commit | b3169b376f1c75e75e97dcdba34e1d214b40c2e1 (patch) | |
| tree | 224a0168d95b50dce931c8920b05ea892e0f21f9 | |
| parent | 2180902f1100a670574d53d21e13a7f2c9c54d15 (diff) | |
| parent | 0172ced4e202e5d8dfb0086a0370007113f39c5b (diff) | |
| download | forums-b3169b376f1c75e75e97dcdba34e1d214b40c2e1.tar forums-b3169b376f1c75e75e97dcdba34e1d214b40c2e1.tar.gz forums-b3169b376f1c75e75e97dcdba34e1d214b40c2e1.tar.bz2 forums-b3169b376f1c75e75e97dcdba34e1d214b40c2e1.tar.xz forums-b3169b376f1c75e75e97dcdba34e1d214b40c2e1.zip | |
Merge branch 'ticket/unknownbliss/10719' into develop
* ticket/unknownbliss/10719:
[ticket/10719] Revert "Skip functional tests on PHP 5.2"
| -rw-r--r-- | phpunit.xml.all | 4 | ||||
| -rw-r--r-- | phpunit.xml.dist | 4 | ||||
| -rw-r--r-- | phpunit.xml.functional | 4 | ||||
| -rw-r--r-- | tests/bootstrap.php | 6 |
4 files changed, 1 insertions, 17 deletions
diff --git a/phpunit.xml.all b/phpunit.xml.all index b835a38c20..fde3bbb1a7 100644 --- a/phpunit.xml.all +++ b/phpunit.xml.all @@ -14,10 +14,6 @@ <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/phpunit.xml.dist b/phpunit.xml.dist index da31dce5e3..27dee48aac 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -14,10 +14,6 @@ <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/phpunit.xml.functional b/phpunit.xml.functional index 91d569e65b..9facbcff8b 100644 --- a/phpunit.xml.functional +++ b/phpunit.xml.functional @@ -14,10 +14,6 @@ <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/tests/bootstrap.php b/tests/bootstrap.php index 302701e3b3..f103d8f15a 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -25,8 +25,4 @@ require_once 'test_framework/phpbb_test_case_helpers.php'; require_once 'test_framework/phpbb_test_case.php'; require_once 'test_framework/phpbb_database_test_case.php'; require_once 'test_framework/phpbb_database_test_connection_manager.php'; - -if (version_compare(PHP_VERSION, '5.3.0-dev', '>=')) -{ - require_once 'test_framework/phpbb_functional_test_case.php'; -} +require_once 'test_framework/phpbb_functional_test_case.php'; |