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($$)