Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Patch #484610 by Damien Tournoud: do not start an output buffer when running in CLI mode.

merge-requests/26/head
Dries Buytaert 2009-06-10 16:17:02 +00:00
parent a13bad5890
commit 027c1e97ea
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/run-tests.sh
View File

@ -12,16 +12,20 @@ define('SIMPLETEST_SCRIPT_COLOR_EXCEPTION', 33); // Brown.
// Set defaults and get overrides. // Set defaults and get overrides.
list($args, $count) = simpletest_script_parse_args(); list($args, $count) = simpletest_script_parse_args();
simpletest_script_init();
if ($args['help'] || $count == 0) { if ($args['help'] || $count == 0) {
simpletest_script_help(); simpletest_script_help();
exit; exit;
} }
if ($args['execute-batch']) { if ($args['execute-batch']) {
// Masquerade as Apache for running tests.
simpletest_script_init("Apache");
simpletest_script_execute_batch(); simpletest_script_execute_batch();
} }
else {
// Run administrative functions as CLI.
simpletest_script_init("PHP CLI");
}
// Bootstrap to perform initial validation or other operations. // Bootstrap to perform initial validation or other operations.
drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL); drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
@ -226,7 +230,7 @@ function simpletest_script_parse_args() {
/** /**
* Initialize script variables and perform general setup requirements. * Initialize script variables and perform general setup requirements.
*/ */
function simpletest_script_init() { function simpletest_script_init($server_software) {
global $args, $php; global $args, $php;
$host = 'localhost'; $host = 'localhost';
@ -260,7 +264,7 @@ function simpletest_script_init() {
$_SERVER['HTTP_HOST'] = $host; $_SERVER['HTTP_HOST'] = $host;
$_SERVER['REMOTE_ADDR'] = '127.0.0.1'; $_SERVER['REMOTE_ADDR'] = '127.0.0.1';
$_SERVER['SERVER_ADDR'] = '127.0.0.1'; $_SERVER['SERVER_ADDR'] = '127.0.0.1';
$_SERVER['SERVER_SOFTWARE'] = 'Apache'; $_SERVER['SERVER_SOFTWARE'] = $server_software;
$_SERVER['SERVER_NAME'] = 'localhost'; $_SERVER['SERVER_NAME'] = 'localhost';
$_SERVER['REQUEST_URI'] = $path .'/'; $_SERVER['REQUEST_URI'] = $path .'/';
$_SERVER['REQUEST_METHOD'] = 'GET'; $_SERVER['REQUEST_METHOD'] = 'GET';