diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2010-10-17 23:36:09 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2010-10-17 23:36:09 +0200 |
| commit | 6eb061ef0c2ed91e2afcf6447b11d0755d6ef67c (patch) | |
| tree | 6582527cf3932a9970e99f7f245272431b47e713 /tests/all_tests.php | |
| parent | 642f940bc82bd426dfcc27d5d13ff6296c2f7fe6 (diff) | |
| parent | d56bf3b0604a8b7699cbd2b4cf7104e7344608bf (diff) | |
| download | forums-6eb061ef0c2ed91e2afcf6447b11d0755d6ef67c.tar forums-6eb061ef0c2ed91e2afcf6447b11d0755d6ef67c.tar.gz forums-6eb061ef0c2ed91e2afcf6447b11d0755d6ef67c.tar.bz2 forums-6eb061ef0c2ed91e2afcf6447b11d0755d6ef67c.tar.xz forums-6eb061ef0c2ed91e2afcf6447b11d0755d6ef67c.zip | |
Merge branch 'ticket/naderman/9855' into develop-olympus
* ticket/naderman/9855:
[ticket/9855] Do not include the PHPUnit Framework manually on 3.5+.
[ticket/9855] Make tests run under PHPUnit 3.5.
Diffstat (limited to 'tests/all_tests.php')
| -rw-r--r-- | tests/all_tests.php | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tests/all_tests.php b/tests/all_tests.php index bae7725ee7..d1d711c4d7 100644 --- a/tests/all_tests.php +++ b/tests/all_tests.php @@ -28,7 +28,14 @@ require_once 'network/all_tests.php'; require_once 'random/all_tests.php'; // exclude the test directory from code coverage reports -PHPUnit_Util_Filter::addDirectoryToFilter('./'); +if (version_compare(PHPUnit_Runner_Version::id(), '3.5.0') >= 0) +{ + PHP_CodeCoverage_Filter::getInstance()->addDirectoryToBlacklist('./'); +} +else +{ + PHPUnit_Util_Filter::addDirectoryToFilter('./'); +} class phpbb_all_tests { |