diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-10-17 16:35:10 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-10-17 16:35:10 +0200 |
| commit | af11d94fb01e35445b3bf15a8d1fdbeb2e51fef4 (patch) | |
| tree | 43b41002184c70102d294f670c485b0ff07cf251 | |
| parent | 2d42dbc385c500e185059d1b503cc0c35ca71a0f (diff) | |
| parent | 9c861a0350ae67f06a38ee6efc890412a32751f4 (diff) | |
| download | forums-af11d94fb01e35445b3bf15a8d1fdbeb2e51fef4.tar forums-af11d94fb01e35445b3bf15a8d1fdbeb2e51fef4.tar.gz forums-af11d94fb01e35445b3bf15a8d1fdbeb2e51fef4.tar.bz2 forums-af11d94fb01e35445b3bf15a8d1fdbeb2e51fef4.tar.xz forums-af11d94fb01e35445b3bf15a8d1fdbeb2e51fef4.zip | |
Merge remote-tracking branch 'naderman/ticket/10414' into develop
* naderman/ticket/10414:
[ticket/10414] Skip functional tests on PHP 5.2 - requires PHPUnit 3.6 on 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, 17 insertions, 1 deletions
diff --git a/phpunit.xml.all b/phpunit.xml.all index fde3bbb1a7..b835a38c20 100644 --- a/phpunit.xml.all +++ b/phpunit.xml.all @@ -14,6 +14,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/phpunit.xml.dist b/phpunit.xml.dist index 27dee48aac..da31dce5e3 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -14,6 +14,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/phpunit.xml.functional b/phpunit.xml.functional index 9facbcff8b..91d569e65b 100644 --- a/phpunit.xml.functional +++ b/phpunit.xml.functional @@ -14,6 +14,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/tests/bootstrap.php b/tests/bootstrap.php index 9a1c8857c0..855ea1ce1f 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -39,4 +39,8 @@ 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'; -require_once 'test_framework/phpbb_functional_test_case.php'; + +if (version_compare(PHP_VERSION, '5.3.0-dev', '>=')) +{ + require_once 'test_framework/phpbb_functional_test_case.php'; +} |