Changeset 86922 in webkit

Timestamp:

May 19, 2011 9:10:49 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-05-19 Dmitry Lomov <​dslomov@google.com>

Reviewed by Adam Roben.

Detect hangs in run-api-tests
​https://bugs.webkit.org/show_bug.cgi?id=48043

• Scripts/run-api-tests: Added test timeouts

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/run-api-tests (modified) (4 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-05-19  Dmitry Lomov  <dslomov@google.com>
+
+        Reviewed by Adam Roben.
+
+        Detect hangs in run-api-tests
+        https://bugs.webkit.org/show_bug.cgi?id=48043
+
+        * Scripts/run-api-tests: Added test timeouts
+
 2011-05-19  Dmitry Lomov  <dslomov@google.com>
 

trunk/Tools/Scripts/run-api-tests

@@ -46 +46 @@
 sub runTest($$);
 
+# Timeout for individual test, in sec
+my $timeout = 10;
+
 my $showHelp = 0;
 my $verbose = 0;
@@ -132 +135 @@
 
     my $result = 0;
+    my $timedOut = 0;
     if (isAppleMacWebKit()) {
         my $productDir = productDir();
@@ -160 +164 @@
         close($childErr);
         close(DEVNULL) unless ($verbose);
-
-        waitpid($pid, 0);
-        $result = $?;
-    } elsif (isAppleWinWebKit()) {
+        eval {
+            local $SIG{ALRM} = sub { die "alarm\n" };
+            alarm $timeout;
+            waitpid($pid, 0);
+            alarm 0;
+            $result = $?;
+        };
+        if ($@) {
+            die unless $@ eq "alarm\n";
+            kill SIGTERM, $pid or kill SIGKILL, $pid;
+            $timedOut = 1;
+        };
+
+     } elsif (isAppleWinWebKit()) {
         my $apiTesterNameSuffix;
         if (configurationForVisualStudio() ne "Debug_All") {
@@ -171 +185 @@
         }
         my $apiTesterPath = File::Spec->catfile(productDir(), "TestWebKitAPI$apiTesterNameSuffix.exe");
-        $result = system { $apiTesterPath } $apiTesterPath, $gtestArg, @ARGV;
+        eval {
+            local $SIG{ALRM} = sub { die "alarm\n" };
+            alarm $timeout;
+            $result = system { $apiTesterPath } $apiTesterPath, $gtestArg, @ARGV;
+            alarm 0;
+        };
+        if ($@) {
+            die unless $@ eq "alarm\n";
+            $timedOut = 1;
+        };
     } else {
         die "run-api-tests is not supported on this platform.\n"
     }
-   
-    if (!$result) {
+
+    if ($timedOut) {
+        print BOLD YELLOW, "Timeout", RESET, "\n";
+    } elsif (!$result) {
         print BOLD GREEN, "Passed", RESET, "\n";
     } else {
         print BOLD RED, "Failed", RESET, "\n";
     }
-    return $result;
+    return $timedOut || $result;
 }