helly Thu Dec 8 17:51:02 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src run-tests.php
Log:
- MFH
. Add ability to create temp files in separate dir and keep them.
. Add ability to create links in html results as table.
http://cvs.php.net/diff.php/php-src/run-tests.php?r1=1.226.2.8&r2=1.226.2.9&ty=u
Index: php-src/run-tests.php
diff -u php-src/run-tests.php:1.226.2.8 php-src/run-tests.php:1.226.2.9
--- php-src/run-tests.php:1.226.2.8 Wed Dec 7 06:28:58 2005
+++ php-src/run-tests.php Thu Dec 8 17:51:01 2005
@@ -23,7 +23,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: run-tests.php,v 1.226.2.8 2005/12/07 11:28:58 sniper Exp $ */
+/* $Id: run-tests.php,v 1.226.2.9 2005/12/08 22:51:01 helly Exp $ */
/* Sanity check to ensure that pcre extension needed by this script is
available.
* In the event it is not, print a nice error message indicating that this
script will
@@ -232,6 +232,9 @@
$leak_check = false;
$html_output = false;
$html_file = null;
+$temp_source = null;
+$temp_target = null;
+$temp_urlbase = null;
if (getenv('TEST_PHP_ARGS'))
{
@@ -301,6 +304,18 @@
$output_file = $argv[++$i];
$just_save_results = true;
break;
+ case '--temp-source':
+ $temp_source = $argv[++$i];
+ break;
+ case '--temp-target':
+ $temp_target = $argv[++$i];
+ if ($temp_urlbase) {
+ $temp_urlbase = $temp_target;
+ }
+ break;
+ case '--temp-urlbase':
+ $temp_urlbase = $argv[++$i];
+ break;
case 'v':
case '--verbose':
$DETAILED = true;
@@ -318,11 +333,14 @@
$html_output = is_resource($html_file);
break;
case '--version':
- echo "$Id: run-tests.php,v 1.226.2.8
2005/12/07 11:28:58 sniper Exp $\n";
+ echo "$Id: run-tests.php,v 1.226.2.9
2005/12/08 22:51:01 helly Exp $\n";
exit(1);
default:
- echo "Illegal switch specified!\n";
- //break
+ echo "Illegal switch '$switch'
specified!\n";
+ if ($switch == 'u' || $switch == 'U') {
+ break;
+ }
+ // break
case 'h':
case '-help':
case '--help':
@@ -353,13 +371,21 @@
-q Quite, no user interaction (same as environment
NO_INTERACTION).
- --verbose
+ --verbose
-v Verbose mode.
- --help
+ --help
-h This Help.
- --html Generate HTML output.
+ --html <file> Generate HTML output.
+
+ --temp-source <sdir> --temp-target <tdir> [--temp-urlbase <url>]
+ Write temporary files to <tdir> by replacing <sdir> from the
+ filenames to generate with <tdir>. If --html is being used and
+ <url> given then the generated links are relative and prefixed
+ with the given url. In general you want to make <sdir> the path
+ to your source files and <tdir> some pach in your web page
+ hierarchy with <url> pointing to <tdir>.
HELP;
exit(1);
@@ -690,11 +716,16 @@
// Write the given text to a temporary file, and return the filename.
//
-function save_text($filename, $text)
+function save_text($filename, $text, $filename_copy = null)
{
global $DETAILED;
- if (@file_put_contents($filename, $text) === FALSE) {
+ if ($filename_copy && $filename_copy != $filename) {
+ if (@file_put_contents($filename_copy, $text) === false) {
+ error("Cannot open file '" . $filename_copy . "'
(save_text)");
+ }
+ }
+ if (@file_put_contents($filename, $text) === false) {
error("Cannot open file '" . $filename . "' (save_text)");
}
if (1 < $DETAILED) echo "
@@ -753,7 +784,7 @@
return $data;
} else if ($n > 0) {
$line = fread($pipes[1], 8192);
- if (strlen($line) == 0) {
+ if ($line === false) {
/* EOF */
break;
}
@@ -798,8 +829,9 @@
//
function run_test($php, $file)
{
- global $log_format, $info_params, $ini_overwrites, $cwd,
$PHP_FAILED_TESTS, $pass_options, $DETAILED, $IN_REDIRECT, $test_cnt,
$test_idx, $leak_check;
+ global $log_format, $info_params, $ini_overwrites, $cwd,
$PHP_FAILED_TESTS, $pass_options, $DETAILED, $IN_REDIRECT, $test_cnt,
$test_idx, $leak_check, $temp_source, $temp_target;
+ $temp_filenames = null;
$org_file = $file;
if (is_array($file)) $file = $file[0];
@@ -852,13 +884,13 @@
if (@count($section_text['REDIRECTTEST']) == 1) {
if ($IN_REDIRECT) {
$borked = true;
- $bork_info = "Can't redirect a test from within a
redirected test [$file]";
+ $bork_info = "Can't redirect a test from within a
redirected test";
} else {
$borked = false;
}
} else {
if (@count($section_text['FILE']) +
@count($section_text['FILEEOF']) != 1) {
- $bork_info = "missing section --FILE-- [$file]";
+ $bork_info = "missing section --FILE--";
$borked = true;
}
if (@count($section_text['FILEEOF']) == 1) {
@@ -866,26 +898,27 @@
unset($section_text['FILEEOF']);
}
if ((@count($section_text['EXPECT']) +
@count($section_text['EXPECTF']) + @count($section_text['EXPECTREGEX'])) != 1) {
- $bork_info = "missing section --EXPECT--, --EXPECTF--
or --EXPECTREGEX-- [$file]";
+ $bork_info = "missing section --EXPECT--, --EXPECTF--
or --EXPECTREGEX--";
$borked = true;
}
}
fclose($fp);
if ($borked) {
- show_result("BORK", $bork_info, $file);
+ show_result("BORK", $bork_info);
$PHP_FAILED_TESTS['BORKED'][] = array (
'name' => $file,
'test_name' =>
'',
'output' => '',
'diff' => '',
- 'info' =>
$bork_info,
+ 'info' =>
"$bork_info [$file]",
);
return 'BORKED';
}
$shortname = str_replace($cwd.'/', '', $file);
- $tested = trim($section_text['TEST'])." [$shortname]";
+ $tested = trim($section_text['TEST']);
+ $tested_file = $shortname;
/* For GET/POST tests, check if cgi sapi is available and if it is, use
it. */
if ((!empty($section_text['GET']) || !empty($section_text['POST']))) {
@@ -893,7 +926,7 @@
$old_php = $php;
$php = realpath("./sapi/cgi/php") . ' -C ';
} else {
- show_result("SKIP", $tested, $file, "reason: CGI not
available");
+ show_result("SKIP", $tested, $tested_file, "reason: CGI
not available");
return 'SKIPPED';
}
}
@@ -901,23 +934,48 @@
show_test($test_idx, $shortname);
if (is_array($IN_REDIRECT)) {
- $tmp = $IN_REDIRECT['dir'];
+ $temp_dir = $test_dir = $IN_REDIRECT['dir'];
} else {
- $tmp = realpath(dirname($file));
+ $temp_dir = $test_dir = realpath(dirname($file));
+ }
+ if ($temp_source && $temp_target) {
+ $temp_dir = str_replace($temp_source, $temp_target, $temp_dir);
}
- $diff_filename = $tmp . DIRECTORY_SEPARATOR .
basename($file,'phpt').'diff';
- $log_filename = $tmp . DIRECTORY_SEPARATOR .
basename($file,'phpt').'log';
- $exp_filename = $tmp . DIRECTORY_SEPARATOR .
basename($file,'phpt').'exp';
- $output_filename = $tmp . DIRECTORY_SEPARATOR .
basename($file,'phpt').'out';
- $memcheck_filename = $tmp . DIRECTORY_SEPARATOR .
basename($file,'phpt').'mem';
- $tmp_file = $tmp . DIRECTORY_SEPARATOR .
basename($file,'phpt').'php';
- $tmp_skipif = $tmp . DIRECTORY_SEPARATOR .
basename($file,'phpt').'skip';
- $tmp_post = $tmp . DIRECTORY_SEPARATOR . uniqid('/phpt.');
- $tmp_relative_file = str_replace(dirname(__FILE__).DIRECTORY_SEPARATOR,
'', $tmp_file) . 't';
+ $diff_filename = $temp_dir . DIRECTORY_SEPARATOR .
basename($file,'phpt').'diff';
+ $log_filename = $temp_dir . DIRECTORY_SEPARATOR .
basename($file,'phpt').'log';
+ $exp_filename = $temp_dir . DIRECTORY_SEPARATOR .
basename($file,'phpt').'exp';
+ $output_filename = $temp_dir . DIRECTORY_SEPARATOR .
basename($file,'phpt').'out';
+ $memcheck_filename = $temp_dir . DIRECTORY_SEPARATOR .
basename($file,'phpt').'mem';
+ $temp_file = $temp_dir . DIRECTORY_SEPARATOR .
basename($file,'phpt').'php';
+ $test_file = $test_dir . DIRECTORY_SEPARATOR .
basename($file,'phpt').'php';
+ $temp_skipif = $temp_dir . DIRECTORY_SEPARATOR .
basename($file,'phpt').'skip';
+ $test_skipif = $test_dir . DIRECTORY_SEPARATOR .
basename($file,'phpt').'skip';
+ $tmp_post = $temp_dir . DIRECTORY_SEPARATOR . uniqid('/phpt.');
+ $tmp_relative_file = str_replace(dirname(__FILE__).DIRECTORY_SEPARATOR,
'', $test_file) . 't';
+
+ if ($temp_source && $temp_target) {
+ $temp_skipif .= '.phps';
+ $temp_file .= '.phps';
+ $copy_file = $temp_dir . DIRECTORY_SEPARATOR .
basename(is_array($file) ? $file[1] : $file).'.phps';
+ if (!is_dir(dirname($copy_file))) {
+ @mkdir(dirname($copy_file), 0777, true) or
error("Cannot create output directory - " . dirname($copy_file));
+ }
+ save_text($copy_file, $section_text['FILE']);
+ $temp_filenames = array(
+ 'file' => $copy_file,
+ 'diff' => $diff_filename,
+ 'log' => $log_filename,
+ 'exp' => $exp_filename,
+ 'out' => $output_filename,
+ 'mem' => $memcheck_filename,
+ 'php' => $temp_file,
+ 'skip' => $temp_skipif);
+ }
if (is_array($IN_REDIRECT)) {
- $tested = $IN_REDIRECT['prefix'] . ' ' .
trim($section_text['TEST']) . " [$tmp_relative_file]";
+ $tested = $IN_REDIRECT['prefix'] . ' ' .
trim($section_text['TEST']);
+ $tested_file = $tmp_relative_file;
$section_text['FILE'] = "# original source file: $shortname\n"
. $section_text['FILE'];
}
@@ -927,8 +985,10 @@
@unlink($exp_filename);
@unlink($output_filename);
@unlink($memcheck_filename);
- @unlink($tmp_file);
- @unlink($tmp_skipif);
+ @unlink($temp_file);
+ @unlink($test_file);
+ @unlink($temp_skipif);
+ @unlink($test_skipif);
@unlink($tmp_post);
// Reset environment from any previous test.
@@ -949,22 +1009,22 @@
settings2array($ini_overwrites,$skipif_params);
settings2params($skipif_params);
- save_text($tmp_skipif, $section_text['SKIPIF']);
+ save_text($test_skipif, $section_text['SKIPIF'],
$temp_skipif);
$extra = substr(PHP_OS, 0, 3) !== "WIN" ?
"unset REQUEST_METHOD; unset QUERY_STRING;
unset PATH_TRANSLATED; unset SCRIPT_FILENAME; unset REQUEST_METHOD;": "";
- $output = system_with_timeout("$extra $php -q
$skipif_params $tmp_skipif");
- @unlink($tmp_skipif);
+ $output = system_with_timeout("$extra $php -q
$skipif_params $test_skipif");
+ @unlink($test_skipif);
if (!strncasecmp('skip', trim($output), 4)) {
$reason = (eregi("^skip[[:space:]]*(.+)\$",
trim($output))) ? eregi_replace("^skip[[:space:]]*(.+)\$", "\\1",
trim($output)) : FALSE;
if ($reason) {
- show_result("SKIP", $tested, $file,
"reason: $reason");
+ show_result("SKIP", $tested,
$tested_file, "reason: $reason", $temp_filenames);
} else {
- show_result("SKIP", $tested, $file);
+ show_result("SKIP", $tested,
$tested_file, '', $temp_filenames);
}
if (isset($old_php)) {
$php = $old_php;
}
- @unlink($tmp_skipif);
+ @unlink($test_skipif);
return 'SKIPPED';
}
if (!strncasecmp('info', trim($output), 4)) {
@@ -1002,7 +1062,7 @@
$test_cnt += count($test_files) - 1;
$test_idx--;
- show_redirect_start($IN_REDIRECT['TESTS'], $tested);
+ show_redirect_start($IN_REDIRECT['TESTS'], $tested,
$tested_file);
// set up environment
foreach ($IN_REDIRECT['ENV'] as $k => $v) {
@@ -1013,7 +1073,7 @@
usort($test_files, "test_sort");
run_all_tests($test_files, $tested);
- show_redirect_ends($IN_REDIRECT['TESTS'],
$tested);
+ show_redirect_ends($IN_REDIRECT['TESTS'], $tested,
$tested_file);
// clean up environment
foreach ($IN_REDIRECT['ENV'] as $k => $v) {
@@ -1028,14 +1088,14 @@
}
if (is_array($org_file) || @count($section_text['REDIRECTTEST']) == 1) {
if (is_array($org_file)) $file = $org_file[0];
- $bork_info = "Redirected test did not contain redirection info:
[$file]";
- show_result("BORK", $bork_info, $file);
+ $bork_info = "Redirected test did not contain redirection info";
+ show_result("BORK", $bork_info, '', $temp_filenames);
$PHP_FAILED_TESTS['BORKED'][] = array (
'name' => $file,
'test_name' =>
'',
'output' => '',
'diff' => '',
- 'info' =>
$bork_info,
+ 'info' =>
"$bork_info [$file]",
);
//$test_cnt -= 1; // Only if is_array($org_file) ?
//$test_idx--;
@@ -1060,7 +1120,7 @@
settings2params($ini_settings);
// We've satisfied the preconditions - run the test!
- save_text($tmp_file,$section_text['FILE']);
+ save_text($test_file, $section_text['FILE'], $temp_file);
if (array_key_exists('GET', $section_text)) {
$query_string = trim($section_text['GET']);
} else {
@@ -1075,22 +1135,22 @@
putenv("REDIRECT_STATUS=1");
putenv("QUERY_STRING=$query_string");
- putenv("PATH_TRANSLATED=$tmp_file");
- putenv("SCRIPT_FILENAME=$tmp_file");
+ putenv("PATH_TRANSLATED=$test_file");
+ putenv("SCRIPT_FILENAME=$test_file");
$args = $section_text['ARGS'] ? ' -- '.$section_text['ARGS'] : '';
if (array_key_exists('POST', $section_text) &&
!empty($section_text['POST'])) {
$post = trim($section_text['POST']);
- save_text($tmp_post,$post);
+ save_text($tmp_post, $post);
$content_length = strlen($post);
putenv("REQUEST_METHOD=POST");
putenv("CONTENT_TYPE=application/x-www-form-urlencoded");
putenv("CONTENT_LENGTH=$content_length");
- $cmd = "$php$pass_options$ini_settings -f \"$tmp_file\" 2>&1 <
$tmp_post";
+ $cmd = "$php$pass_options$ini_settings -f \"$test_file\" 2>&1 <
$tmp_post";
} else {
@@ -1099,9 +1159,9 @@
putenv("CONTENT_LENGTH=");
if (empty($section_text['ENV'])) {
- $cmd = "$php$pass_options$ini_settings -f \"$tmp_file\"
$args 2>&1";
+ $cmd = "$php$pass_options$ini_settings -f
\"$test_file\" $args 2>&1";
} else {
- $cmd = "$php$pass_options$ini_settings < \"$tmp_file\"
$args 2>&1";
+ $cmd = "$php$pass_options$ini_settings < \"$test_file\"
$args 2>&1";
}
}
@@ -1176,12 +1236,12 @@
*/
if (preg_match("/^$wanted_re\$/s", $output)) {
$passed = true;
- @unlink($tmp_file);
+ @unlink($test_file);
if (isset($old_php)) {
$php = $old_php;
}
if (!$leaked) {
- show_result("PASS", $tested, $file);
+ show_result("PASS", $tested, $tested_file, '',
$temp_filenames);
return 'PASSED';
}
}
@@ -1191,12 +1251,12 @@
// compare and leave on success
if (!strcmp($output, $wanted)) {
$passed = true;
- @unlink($tmp_file);
+ @unlink($test_file);
if (isset($old_php)) {
$php = $old_php;
}
if (!$leaked) {
- show_result("PASS", $tested, $file);
+ show_result("PASS", $tested, $tested_file, '',
$temp_filenames);
return 'PASSED';
}
}
@@ -1212,15 +1272,6 @@
} else {
$restype = 'FAIL';
}
- show_result($restype, $tested, $file, $info);
-
- $PHP_FAILED_TESTS[$restype.'ED'][] = array (
- 'name' => $file,
- 'test_name' =>
(is_array($IN_REDIRECT) ? $IN_REDIRECT['via'] : '') . $tested,
- 'output' => $output_filename,
- 'diff' => $diff_filename,
- 'info' => $info
- );
if (!$passed) {
// write .exp
@@ -1251,6 +1302,16 @@
}
}
+ show_result($restype, $tested, $tested_file, $info, $temp_filenames);
+
+ $PHP_FAILED_TESTS[$restype.'ED'][] = array (
+ 'name' => $file,
+ 'test_name' =>
(is_array($IN_REDIRECT) ? $IN_REDIRECT['via'] : '') . $tested . "
[$tested_file]",
+ 'output' => $output_filename,
+ 'diff' => $diff_filename,
+ 'info' => $info
+ );
+
if (isset($old_php)) {
$php = $old_php;
}
@@ -1542,26 +1603,26 @@
echo get_summary(true, false);
}
-function show_redirect_start($tests, $tested)
+function show_redirect_start($tests, $tested, $tested_file)
{
global $html_output, $html_file;
if ($html_output)
{
- fwrite($html_file, "<tr><td colspan='3'>---> $tests
($tested) begin</td></tr>\n");
+ fwrite($html_file, "<tr><td colspan='3'>---> $tests ($tested
[$tested_file]) begin</td></tr>\n");
}
- echo "---> $tests ($tested) begin\n";
+ echo "---> $tests ($tested [$tested_file]) begin\n";
}
-function show_redirect_ends($tests, $tested)
+function show_redirect_ends($tests, $tested, $tested_file)
{
global $html_output, $html_file;
if ($html_output)
{
- fwrite($html_file, "<tr><td colspan='3'>---> $tests
($tested) done</td></tr>\n");
+ fwrite($html_file, "<tr><td colspan='3'>---> $tests ($tested
[$tested_file]) done</td></tr>\n");
}
- echo "---> $tests ($tested) done\n";
+ echo "---> $tests ($tested [$tested_file]) done\n";
}
function show_test($test_idx, $shortname)
@@ -1572,20 +1633,48 @@
flush();
}
-function show_result($result, $tested, $file, $extra = '')
+function show_result($result, $tested, $tested_file, $extra = '',
$temp_filenames = null)
{
- global $html_output, $html_file;
+ global $html_output, $html_file, $temp_target, $temp_urlbase;
+
+ echo "$result $tested [$tested_file] $extra\n";
if ($html_output)
{
+ if (isset($temp_filenames['file'])) {
+ $url = str_replace($temp_target, $temp_urlbase,
$temp_filenames['file']);
+ $tested = "<a href='$url'>$tested</a>";
+ }
+ if (isset($temp_filenames['skip']) &&
@file_exists($temp_filenames['skip'])) {
+ if (empty($extra)) {
+ $extra = "skipif";
+ }
+ $url = str_replace($temp_target, $temp_urlbase,
$temp_filenames['skip']);
+ $extra = "<a href='$url'>$extra</a>";
+ } else if (empty($extra)) {
+ $extra = " ";
+ }
+ if (isset($temp_filenames['diff']) &&
@file_exists($temp_filenames['diff'])) {
+ $url = str_replace($temp_target, $temp_urlbase,
$temp_filenames['diff']);
+ $diff = "<a href='$url'>diff</a>";
+ } else {
+ $diff = " ";
+ }
+ if (isset($temp_filenames['mem']) &&
@file_exists($temp_filenames['mem'])) {
+ $url = str_replace($temp_target, $temp_urlbase,
$temp_filenames['mem']);
+ $mem = "<a href='$url'>leaks</a>";
+ } else {
+ $mem = " ";
+ }
fwrite($html_file,
"<tr>" .
"<td>$result</td>" .
"<td>$tested</td>" .
- "<td>" . (empty($extra) ? " " : $extra) . "</td>" .
+ "<td>$extra</td>" .
+ "<td>$diff</td>" .
+ "<td>$mem</td>" .
"</tr>\n");
}
- echo "$result $tested $extra\n";
}
/*
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
