MFB: info in mail too

diff --git a/run-tests.php b/run-tests.php
index e70ca408d5b572845bee818d9111b3ed4e5795ba..1d93f9c2ebe8f25d298d9e16167d0ade495004b6 100755 (executable)
--- 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";
        }