From 2f279cd22420e19c69ac5f1ddbf6d2a39729e30f Mon Sep 17 00:00:00 2001
From: Nuno Lopes <nlopess@php.net>
Date: Mon, 29 Jan 2007 22:55:22 +0000
Subject: [PATCH] display all errors/leaks/warnings on each test, instead of
 showing just the top most error

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

diff --git a/run-tests.php b/run-tests.php
index 54318c6bb2..cc0cd63d81 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -1568,11 +1568,13 @@ COMMAND $cmd
 	}
 
 	if ($leaked) {
-		$restype = 'LEAK';
-	} else if ($warn) {
-		$restype = 'WARN';
-	} else {
-		$restype = 'FAIL';
+		$restype[] = 'LEAK';
+	}
+	if ($warn) {
+		$restype[] = 'WARN';
+	}
+	if (!$passed) {
+		$restype[] = 'FAIL';
 	}
 
 	if (!$passed) {
@@ -1604,9 +1606,10 @@ $output
 		}
 	}
 
-	show_result($restype, $tested, $tested_file, $unicode_semantics, $info, $temp_filenames);
+	show_result(implode('&', $restype), $tested, $tested_file, $unicode_semantics, $info, $temp_filenames);
 
-	$PHP_FAILED_TESTS[$restype.'ED'][] = array (
+	foreach ($restype as $type) {
+		$PHP_FAILED_TESTS[$type.'ED'][] = array (
 						'name' => $file,
 						'test_name' => (is_array($IN_REDIRECT) ? $IN_REDIRECT['via'] : '') . $tested . " [$tested_file]",
 						'output' => $output_filename,
@@ -1614,12 +1617,13 @@ $output
 						'info'   => $info,
 						'unicode'=> $unicode_semantics,
 						);
+	}
 
 	if (isset($old_php)) {
 		$php = $old_php;
 	}
 
-	return $restype.'ED';
+	return $restype[0].'ED';
 }
 
 function comp_line($l1,$l2,$is_reg)
-- 
2.50.1