cvs: php4(PHP_4_3) / run-tests.php

helly Fri May 23 16:55:57 2003 EDT Modified files: (Branch: PHP_4_3) /php4 run-tests.php Log: MFH: Add warning level for tests. Index: php4/run-tests.php diff -u php4/run-tests.php:1.119.2.27 php4/run-tests.php:1.119.2.28 --- php4/run-tests.php:1.119.2.27 Sat May 17 16:07:00 2003 +++ php4/run-tests.php Fri May 23 16:55:57 2003 @@ -298,7 +298,7 @@ $n_total = count($test_results); $n_total += $ignored_by_ext; -$sum_results = array('PASSED'=>0, 'SKIPPED'=>0, 'FAILED'=>0); +$sum_results = array('PASSED'=>0, 'WARNED'=>0, 'SKIPPED'=>0, 'FAILED'=>0); foreach ($test_results as $v) { $sum_results[$v]++; } @@ -321,6 +321,7 @@ --------------------------------------------------------------------- Number of tests : " . sprintf("%4d",$n_total) . " Tests skipped : " . sprintf("%4d (%2.1f%%)",$sum_results['SKIPPED'],$percent_results['SKIPPED']) . " +Tests warned : " . sprintf("%4d (%2.1f%%)",$sum_results['WARNED'],$percent_results['WARNED']) . " Tests failed : " . sprintf("%4d (%2.1f%%)",$sum_results['FAILED'],$percent_results['FAILED']) . " Tests passed : " . sprintf("%4d (%2.1f%%)",$sum_results['PASSED'],$percent_results['PASSED']) . " --------------------------------------------------------------------- @@ -593,6 +594,7 @@ // Check if test should be skipped. $info = ''; + $warn = false; if (array_key_exists('SKIPIF', $section_text)) { if (trim($section_text['SKIPIF'])) { save_text($tmp_skipif, $section_text['SKIPIF']); @@ -615,6 +617,14 @@ $tested .= $info; } } + if (eregi("^warn", trim($output))) { + $reason = (ereg("^warn[[:space:]]*(.+)\$", trim($output))) ? ereg_replace("^warn[[:space:]]*(.+)\$", "\\1", trim($output)) : FALSE; + if ($reason) { + $warn = true; /* only if there is a reason */ + $info = " (warn: $reason)"; + $tested .= $info; + } + } } } @@ -728,7 +738,11 @@ } // Test failed so we need to report details. - echo "FAIL $tested\n"; + if ($warn) { + echo "WARN $tested\n"; + } else { + echo "FAIL $tested\n"; + } $GLOBALS['__PHP_FAILED_TESTS__'][] = array( 'name' => $file, @@ -777,7 +791,7 @@ error_report($file,$logname,$tested); } - return 'FAILED'; + return $warn ? 'WARNED' : 'FAILED'; } function generate_diff($wanted,$output)