MDL-32149 allow defining of PHPUNIT_LONGTEST from /config.php and improve acceslib tests

This commit is contained in:
Petr Skoda
2012-04-03 22:30:59 +02:00
parent ba0c484308
commit 7514f9c243
2 changed files with 44 additions and 45 deletions
+5 -5
View File
@@ -46,11 +46,6 @@ if (defined('PHPUNIT_TEST')) {
/** PHPUnit testing framework active */
define('PHPUNIT_TEST', true);
if (!defined('PHPUNIT_LONGTEST')) {
/** Execute longer version of tests */
define('PHPUNIT_LONGTEST', false);
}
if (!defined('PHPUNIT_UTIL')) {
/** Identifies utility scripts */
define('PHPUNIT_UTIL', false);
@@ -67,6 +62,11 @@ define('NO_OUTPUT_BUFFERING', true);
define('ABORT_AFTER_CONFIG', true);
require(__DIR__ . '/../../config.php');
if (!defined('PHPUNIT_LONGTEST')) {
/** Execute longer version of tests */
define('PHPUNIT_LONGTEST', false);
}
// remove error handling overrides done in config.php
error_reporting(E_ALL | E_STRICT);
ini_set('display_errors', '1');