diff options
| author | Ben Murdoch <benm@google.com> | 2010-07-22 15:37:06 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-07-27 10:20:25 +0100 |
| commit | 967717af5423377c967781471ee106e2bb4e11c8 (patch) | |
| tree | 1e701dc0a12f7f07cce1df4a7681717de77a211b /WebKitTools/Scripts/old-run-webkit-tests | |
| parent | dcc30a9fca45f634b1d3a12b276d3a0ccce99fc3 (diff) | |
| download | external_webkit-967717af5423377c967781471ee106e2bb4e11c8.zip external_webkit-967717af5423377c967781471ee106e2bb4e11c8.tar.gz external_webkit-967717af5423377c967781471ee106e2bb4e11c8.tar.bz2 | |
Merge WebKit at r63859 : Initial merge by git.
Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62
Diffstat (limited to 'WebKitTools/Scripts/old-run-webkit-tests')
| -rwxr-xr-x | WebKitTools/Scripts/old-run-webkit-tests | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/WebKitTools/Scripts/old-run-webkit-tests b/WebKitTools/Scripts/old-run-webkit-tests index 30c585f..88c0a05 100755 --- a/WebKitTools/Scripts/old-run-webkit-tests +++ b/WebKitTools/Scripts/old-run-webkit-tests @@ -532,6 +532,7 @@ if (!$has3DRendering) { if (!checkWebCoreFeatureSupport("3D Canvas", 0)) { $ignoredDirectories{'fast/canvas/webgl'} = 1; + $ignoredDirectories{'compositing/webgl'} = 1; } if (checkWebCoreFeatureSupport("WML", 0)) { @@ -1635,6 +1636,12 @@ sub testCrashedOrTimedOut($$$$$) kill 9, $dumpToolPID unless $didCrash; closeDumpTool(); + + return unless isCygwin() && !$didCrash && $base =~ /^http/; + # On Cygwin, http tests timing out can be a symptom of a non-responsive httpd. + # If we timed out running an http test, try restarting httpd. + $isHttpdOpen = !closeHTTPD(); + configureAndOpenHTTPDIfNeeded(); } sub printFailureMessageForTest($$) |