aboutsummaryrefslogtreecommitdiffstats
path: root/tests/all_tests.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2009-10-05 16:15:54 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2009-10-05 16:15:54 +0000
commit8243e9a3728feca2356add9684f91451bf28a43f (patch)
tree1e53c8a9eed992836567803b7e348078764f1e6f /tests/all_tests.php
parent2e17e448deed073f8614bb555a8ef20c57291c2a (diff)
downloadforums-8243e9a3728feca2356add9684f91451bf28a43f.tar
forums-8243e9a3728feca2356add9684f91451bf28a43f.tar.gz
forums-8243e9a3728feca2356add9684f91451bf28a43f.tar.bz2
forums-8243e9a3728feca2356add9684f91451bf28a43f.tar.xz
forums-8243e9a3728feca2356add9684f91451bf28a43f.zip
adjust tests a little bit to let them work again in trunk (not adjusted template/bbcode yet)
git-svn-id: file:///svn/phpbb/trunk@10212 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'tests/all_tests.php')
-rw-r--r--tests/all_tests.php14
1 files changed, 5 insertions, 9 deletions
diff --git a/tests/all_tests.php b/tests/all_tests.php
index 60a66598e7..f22ee5dc49 100644
--- a/tests/all_tests.php
+++ b/tests/all_tests.php
@@ -8,8 +8,6 @@
*
*/
-define('IN_PHPBB', true);
-
if (!defined('PHPUnit_MAIN_METHOD'))
{
define('PHPUnit_MAIN_METHOD', 'phpbb_all_tests::main');
@@ -18,11 +16,11 @@ if (!defined('PHPUnit_MAIN_METHOD'))
require_once 'test_framework/framework.php';
require_once 'PHPUnit/TextUI/TestRunner.php';
-require_once 'bbcode/all_tests.php';
require_once 'utf/all_tests.php';
require_once 'request/all_tests.php';
require_once 'security/all_tests.php';
-require_once 'template/all_tests.php';
+#require_once 'template/all_tests.php';
+#require_once 'bbcode/all_tests.php';
require_once 'text_processing/all_tests.php';
// exclude the test directory from code coverage reports
@@ -39,12 +37,12 @@ class phpbb_all_tests
{
$suite = new PHPUnit_Framework_TestSuite('phpBB');
- $suite->addTest(phpbb_bbcode_all_tests::suite());
+ $suite->addTest(phpbb_utf_all_tests::suite());
$suite->addTest(phpbb_request_all_tests::suite());
$suite->addTest(phpbb_security_all_tests::suite());
- $suite->addTest(phpbb_template_all_tests::suite());
+# $suite->addTest(phpbb_template_all_tests::suite());
+# $suite->addTest(phpbb_bbcode_all_tests::suite());
$suite->addTest(phpbb_text_processing_all_tests::suite());
- $suite->addTest(phpbb_utf_all_tests::suite());
return $suite;
}
@@ -54,5 +52,3 @@ if (PHPUnit_MAIN_METHOD == 'phpbb_all_tests::main')
{
phpbb_all_tests::main();
}
-
-?> \ No newline at end of file