Changeset 30881 in webkit
- Timestamp:
- Mar 7, 2008 2:32:24 PM (16 years ago)
- Location:
- trunk/WebKitTools
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKitTools/ChangeLog
r30872 r30881 1 2008-03-07 Stephanie <slewis@apple.com> 2 3 Reviewed by Geoff. 4 5 <rdar://problem/5693690> run-webkit-tests swallows STDERR output, including WebCore LEAK messages 6 7 * DumpRenderTree/mac/DumpRenderTree.mm: 8 (dump): push EOF to stderr after every test 9 * Scripts/run-webkit-tests: collect stderr output and print it 10 1 11 2008-03-07 Steve Falkenburg <sfalken@apple.com> 2 12 -
trunk/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm
r30849 r30881 779 779 if (printSeparators) 780 780 puts("#EOF"); 781 fputs("#EOF\n", stderr); 781 782 } 782 783 … … 785 786 786 787 fflush(stdout); 788 fflush(stderr); 787 789 788 790 done = YES; -
trunk/WebKitTools/Scripts/run-webkit-tests
r30789 r30881 559 559 } 560 560 561 my $error = ""; 562 while (<ERROR>) { 563 last if /#EOF/; 564 $error .= $_; 565 } 566 561 567 my $isText = isTextOnlyTest($actual); 562 568 … … 722 728 723 729 open CRASH, ">", "$testResultsDirectory/$base-$errorTag.txt" or die; 724 print CRASH <ERROR>;730 print CRASH $error; 725 731 close CRASH; 726 732 … … 863 869 closeDumpTool(); 864 870 } 871 872 if ($error) { 873 my $dir = "$testResultsDirectory/$base"; 874 $dir =~ s|/([^/]+)$|| or die "Failed to find test name from base\n"; 875 mkpath $dir; 876 877 open ERROR_OUT, ">", "$testResultsDirectory/$base-$errorTag.txt" or die; 878 print ERROR_OUT $error; 879 close ERROR_OUT; 880 881 $counts{error}++; 882 push @{$tests{error}}, $test; 883 } 865 884 866 885 $count++; … … 928 947 new => "were new", 929 948 crash => "crashed", 949 error => "had stderr output" 930 950 ); 931 951 932 for my $type ("match", "mismatch", "new", "crash" ) {952 for my $type ("match", "mismatch", "new", "crash", "error") { 933 953 my $c = $counts{$type}; 934 954 if ($c) { … … 981 1001 print HTML "<table>\n"; 982 1002 for my $test (@{$tests{crash}}) { 1003 my $base = stripExtension($test); 1004 my $expectedDir = $expectedResultDirectory{$base}; 1005 print HTML "<tr>\n"; 1006 print HTML "<td><a href=\"" . toURL("$testDirectory/$test") . "\">$base</a></td>\n"; 1007 print HTML htmlForExpectedAndActualResults($base); 1008 print HTML "<td><a href=\"$base-$errorTag.txt\">stderr</a></td>\n"; 1009 print HTML "</tr>\n"; 1010 } 1011 print HTML "</table>\n"; 1012 } 1013 1014 if ($counts{error}) { 1015 print HTML "<p>Tests that had stderr output:</p>\n"; 1016 print HTML "<table>\n"; 1017 for my $test (@{$tests{error}}) { 983 1018 my $base = stripExtension($test); 984 1019 my $expectedDir = $expectedResultDirectory{$base};
Note: See TracChangeset
for help on using the changeset viewer.