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/test_framework/framework.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/test_framework/framework.php')
| -rw-r--r-- | tests/test_framework/framework.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/test_framework/framework.php b/tests/test_framework/framework.php index abdcd1ad79..3a11cc6df9 100644 --- a/tests/test_framework/framework.php +++ b/tests/test_framework/framework.php @@ -32,8 +32,12 @@ if (version_compare(PHPUnit_Runner_Version::id(), '3.3.0', '<')) trigger_error('PHPUnit >= 3.3.0 required'); } -require_once 'PHPUnit/Framework.php'; -require_once 'PHPUnit/Extensions/Database/TestCase.php'; +if (version_compare(PHPUnit_Runner_Version::id(), '3.5.0', '<')) +{ + require_once 'PHPUnit/Framework.php'; + require_once 'PHPUnit/Extensions/Database/TestCase.php'; +} + 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'; |