Changeset 30881 in webkit


Ignore:
Timestamp:
Mar 7, 2008 2:32:24 PM (16 years ago)
Author:
Stephanie Lewis
Message:

2008-03-07 Stephanie <Stephanie Lewis>

Reviewed by Geoff.

<rdar://problem/5693690> run-webkit-tests swallows STDERR output, including WebCore LEAK messages

  • DumpRenderTree/mac/DumpRenderTree.mm: (dump): push EOF to stderr after every test
  • Scripts/run-webkit-tests: collect stderr output and print it
Location:
trunk/WebKitTools
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebKitTools/ChangeLog

    r30872 r30881  
     12008-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
    1112008-03-07  Steve Falkenburg  <sfalken@apple.com>
    212
  • trunk/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm

    r30849 r30881  
    779779        if (printSeparators)
    780780            puts("#EOF");
     781            fputs("#EOF\n", stderr);           
    781782    }
    782783   
     
    785786
    786787    fflush(stdout);
     788    fflush(stderr);
    787789
    788790    done = YES;
  • trunk/WebKitTools/Scripts/run-webkit-tests

    r30789 r30881  
    559559    }
    560560
     561    my $error = "";
     562    while (<ERROR>) {
     563       last if /#EOF/;
     564       $error .= $_;
     565    }
     566
    561567    my $isText = isTextOnlyTest($actual);
    562568
     
    722728
    723729        open CRASH, ">", "$testResultsDirectory/$base-$errorTag.txt" or die;
    724         print CRASH <ERROR>;
     730        print CRASH $error;
    725731        close CRASH;
    726732
     
    863869        closeDumpTool();
    864870    }
     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    }
    865884
    866885    $count++;
     
    928947    new => "were new",
    929948    crash => "crashed",
     949    error => "had stderr output"
    930950);
    931951
    932 for my $type ("match", "mismatch", "new", "crash") {
     952for my $type ("match", "mismatch", "new", "crash", "error") {
    933953    my $c = $counts{$type};
    934954    if ($c) {
     
    9811001    print HTML "<table>\n";
    9821002    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
     1014if ($counts{error}) {
     1015    print HTML "<p>Tests that had stderr output:</p>\n";
     1016    print HTML "<table>\n";
     1017    for my $test (@{$tests{error}}) {
    9831018        my $base = stripExtension($test);
    9841019        my $expectedDir = $expectedResultDirectory{$base};
Note: See TracChangeset for help on using the changeset viewer.