]> granicus.if.org Git - php/commitdiff
display all errors/leaks/warnings on each test, instead of showing just the top most...
authorNuno Lopes <nlopess@php.net>
Mon, 29 Jan 2007 22:55:22 +0000 (22:55 +0000)
committerNuno Lopes <nlopess@php.net>
Mon, 29 Jan 2007 22:55:22 +0000 (22:55 +0000)
run-tests.php

index 54318c6bb2cdbef371707e2d98b85a875b51b423..cc0cd63d818179aa72aa8c39ebf44f9606e4a1bf 100755 (executable)
@@ -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)