From 57046f4e3eae38415e64ebdb33194e1d6feebc64 Mon Sep 17 00:00:00 2001
From: Marcus Boerger <helly@php.net>
Date: Sat, 17 May 2003 23:58:03 +0000
Subject: [PATCH] MFB: info in mail too

---
 run-tests.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/run-tests.php b/run-tests.php
index e70ca408d5..1d93f9c2eb 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -373,7 +373,7 @@ if (!getenv('NO_INTERACTION')) {
 
 		if ($sum_results['FAILED']) {
 			foreach ($PHP_FAILED_TESTS as $test_info) {
-				$failed_tests_data .= $sep . $test_info['name'];
+				$failed_tests_data .= $sep . $test_info['name'] . $test_info['info'];
 				$failed_tests_data .= $sep . file_get_contents(realpath($test_info['output']));
 				$failed_tests_data .= $sep . file_get_contents(realpath($test_info['diff']));
 				$failed_tests_data .= $sep . "\n\n";
@@ -556,7 +556,7 @@ function system_with_timeout($commandline)
 //  Run an individual test case.
 //
 
-function run_test($php,$file)
+function run_test($php, $file)
 {
 	global $log_format, $info_params, $ini_overwrites, $cwd, $PHP_FAILED_TESTS;
 
@@ -619,6 +619,7 @@ TEST $file
 	putenv("CONTENT_LENGTH=");
 
 	// Check if test should be skipped.
+	$info = '';
 	if (array_key_exists('SKIPIF', $section_text)) {
 		if (trim($section_text['SKIPIF'])) {
 			save_text($tmp_skipif, $section_text['SKIPIF']);
@@ -637,7 +638,8 @@ TEST $file
 			if (eregi("^info", trim($output))) {
 				$reason = (ereg("^info[[:space:]]*(.+)\$", trim($output))) ? ereg_replace("^info[[:space:]]*(.+)\$", "\\1", trim($output)) : FALSE;
 				if ($reason) {
-					$tested .= " (info: $reason)";
+					$info = " (info: $reason)";
+					$tested .= $info;
 				}
 			}
 		}
@@ -760,7 +762,8 @@ COMMAND $cmd
 						'name' => $file,
 						'test_name' => $tested,
 						'output' => ereg_replace('\.phpt$','.log', $file),
-						'diff'   => ereg_replace('\.phpt$','.diff', $file)
+						'diff'   => ereg_replace('\.phpt$','.diff', $file),
+						'info'   => $info
 						);
 
 	// write .exp
@@ -902,7 +905,7 @@ FAILED TEST SUMMARY
 ---------------------------------------------------------------------
 ";
 	foreach ($PHP_FAILED_TESTS as $failed_test_data) {
-		$failed_test_summary .=  $failed_test_data['test_name'] . "\n";
+		$failed_test_summary .=  $failed_test_data['test_name'] . $failed_test_data['info'] . "\n";
 	}
 	$failed_test_summary .=  "=====================================================================\n";
 	}
-- 
2.40.0