diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2011-01-07 01:39:18 +0100 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2011-01-07 01:39:59 +0100 |
| commit | 14a84cf89cd41da36545f5f04348c49d4eadfb45 (patch) | |
| tree | b04a5988c982b8b367697f03bde3f20ace7d022c /tests/test_framework/framework.php | |
| parent | da4617b14b11ade6f664b8c1ab94e3aeb5b7428d (diff) | |
| parent | 5b752a2fed82f27cb1e383583dc4ccb87f7e12e5 (diff) | |
| download | forums-14a84cf89cd41da36545f5f04348c49d4eadfb45.tar forums-14a84cf89cd41da36545f5f04348c49d4eadfb45.tar.gz forums-14a84cf89cd41da36545f5f04348c49d4eadfb45.tar.bz2 forums-14a84cf89cd41da36545f5f04348c49d4eadfb45.tar.xz forums-14a84cf89cd41da36545f5f04348c49d4eadfb45.zip | |
Merge branch 'develop-olympus' into develop
This commit also ports all ascraeus tests to the new format.
Conflicts:
tests/all_tests.php
tests/network/all_tests.php
tests/request/all_tests.php
tests/request/request_var.php
tests/template/templates/includephp.html
Diffstat (limited to 'tests/test_framework/framework.php')
| -rw-r--r-- | tests/test_framework/framework.php | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/tests/test_framework/framework.php b/tests/test_framework/framework.php deleted file mode 100644 index 3a11cc6df9..0000000000 --- a/tests/test_framework/framework.php +++ /dev/null @@ -1,43 +0,0 @@ -<?php -/** -* -* @package testing -* @copyright (c) 2008 phpBB Group -* @license http://opensource.org/licenses/gpl-license.php GNU Public License -* -*/ - -define('IN_PHPBB', true); -$phpbb_root_path = '../phpBB/'; -$phpEx = 'php'; -$table_prefix = ''; - -// If we are on PHP >= 6.0.0 we do not need some code -if (version_compare(PHP_VERSION, '6.0.0-dev', '>=')) -{ - define('STRIP', false); -} -else -{ - @set_magic_quotes_runtime(0); - define('STRIP', (get_magic_quotes_gpc()) ? true : false); -} - -require_once $phpbb_root_path . 'includes/constants.php'; - -// require at least PHPUnit 3.3.0 -require_once 'PHPUnit/Runner/Version.php'; -if (version_compare(PHPUnit_Runner_Version::id(), '3.3.0', '<')) -{ - trigger_error('PHPUnit >= 3.3.0 required'); -} - -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'; |