Changeset 35844 in webkit


Ignore:
Timestamp:
Aug 19, 2008 1:18:54 PM (16 years ago)
Author:
ap@webkit.org
Message:

Reviewed by Darin.

Fix run-webkit-tests misreporting crashed tests as timed out ones because DumpRenderTree
is waiting for crash reporter to let it exit.

The fix does not work on Tiger, because the state of the process is indistinguishable from
other waiting processes, at least not with this technique.

  • Scripts/run-webkit-tests:
Location:
trunk/WebKitTools
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebKitTools/ChangeLog

    r35816 r35844  
     12008-08-19  Alexey Proskuryakov  <ap@webkit.org>
     2
     3        Reviewed by Darin.
     4
     5        Fix run-webkit-tests misreporting crashed tests as timed out ones because DumpRenderTree
     6        is waiting for crash reporter to let it exit.
     7
     8        The fix does not work on Tiger, because the state of the process is indistinguishable from
     9        other waiting processes, at least not with this technique.
     10
     11        * Scripts/run-webkit-tests:
     12
    1132008-08-18  Alp Toker  <alp@nuanti.com>
    214
  • trunk/WebKitTools/Scripts/run-webkit-tests

    r35711 r35844  
    12171217
    12181218    my $pid = waitpid(-1, WNOHANG);
    1219     return $pid == $dumpToolPID;
     1219    return 1 if ($pid == $dumpToolPID);
     1220
     1221    # On Mac OS X, crashing may be significantly delayed by crash reporter.
     1222    return 0 unless isOSX();
     1223
     1224    my $tryingToExit = 0;
     1225    open PS, "ps -o state -p $dumpToolPID |";
     1226    <PS>; # skip header
     1227    $tryingToExit = 1 if <PS> =~ /E/;
     1228    close PS;
     1229    return $tryingToExit;
    12201230}
    12211231
     
    17361746    while (1) {
    17371747        if (time - $timeOfLastSuccessfulRead > $maximumSecondsWithoutOutput) {
    1738             $status = "timedOut";
     1748            $status = dumpToolDidCrash() ? "crashed" : "timedOut";
    17391749            last;
    17401750        }
Note: See TracChangeset for help on using the changeset viewer.