cvs: php4 / run-tests.php

helly Fri May 23 16:51:09 2003 EDT Modified files: /php4 run-tests.php Log: Add warning level for tests. # You set a test to warning by return "warn <description>" from # the --SKIPIF-- section. But this only works when you supply # a reason why it is only a warning. # Warnings are not called for FAILed tests of corse and hence a # test result with not FAIL but SKIP/PASS/WARN results is mailed # as a PASS. Index: php4/run-tests.php diff -u php4/run-tests.php:1.157 php4/run-tests.php:1.158 --- php4/run-tests.php:1.157 Sat May 17 19:58:03 2003 +++ php4/run-tests.php Fri May 23 16:51:09 2003 @@ -642,6 +642,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; + } + } } } @@ -756,7 +764,11 @@ } // Test failed so we need to report details. - echo "FAIL $tested\n"; + if ($warn) { + echo "WARN $tested\n"; + } else { + echo "FAIL $tested\n"; + } $PHP_FAILED_TESTS[] = array( 'name' => $file, @@ -805,7 +817,7 @@ error_report($file,$logname,$tested); } - return 'FAILED'; + return $warn ? 'WARNED' : 'FAILED'; } function generate_diff($wanted,$output) @@ -862,7 +874,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]++; } @@ -891,6 +903,7 @@ $summary .= " 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']) . " ---------------------------------------------------------------------