Changeset 52876 in webkit

Timestamp:

Jan 6, 2010 3:56:15 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-01-06 Eric Seidel <​eric@webkit.org>

Unreviewed. Rolling out r52869 and r52853 due to bot
and local run-webkit-test failures

REGRESSION(52854?) fast/workers/shared-worker-constructor.html failed on Leopard Build Bot
​https://bugs.webkit.org/show_bug.cgi?id=33256

The original bug was ​https://bugs.webkit.org/show_bug.cgi?id=33153

• Scripts/run-webkit-tests:

Location:

trunk/WebKitTools

Files:

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

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-01-06  Eric Seidel  <eric@webkit.org>
+
+        Unreviewed.  Rolling out r52869 and r52853 due to bot
+        and local run-webkit-test failures
+
+        REGRESSION(52854?) fast/workers/shared-worker-constructor.html failed on Leopard Build Bot
+        https://bugs.webkit.org/show_bug.cgi?id=33256
+
+        The original bug was https://bugs.webkit.org/show_bug.cgi?id=33153
+
+        * Scripts/run-webkit-tests:
+
 2010-01-06  Eric Seidel  <eric@webkit.org>
 

trunk/WebKitTools/Scripts/run-webkit-tests

@@ -144 +144 @@
 my $testHTTP = 1;
 my $testMedia = 1;
-my $testResultsDirectory = catfile(File::Spec->tmpdir(), "layout-test-results");
-my $layoutTestsSymLink = catfile(File::Spec->tmpdir(), "LayoutTests");
-my $httpdPidDir = catfile(File::Spec->tmpdir(), "WebKit");
-my $httpdPidFile = catfile($httpdPidDir, "httpd.pid");
+my $testResultsDirectory = "/tmp/layout-test-results";
 my $testsPerDumpTool = 1000;
 my $threaded = 0;
@@ -405 +402 @@
 }
 
-system "ln", "-s", $testDirectory, $layoutTestsSymLink unless -x $layoutTestsSymLink;
+system "ln", "-s", $testDirectory, "/tmp/LayoutTests" unless -x "/tmp/LayoutTests";
 
 my %ignoredFiles = ( "results.html" => 1 );
@@ -1353 +1350 @@
     return if $isHttpdOpen;
 
-    mkdir $httpdPidDir;
+    mkdir "/tmp/WebKit";
     
-    if (-f $httpdPidFile) {
-        my $oldPid = `cat "$httpdPidFile"`;
+    if (-f "/tmp/WebKit/httpd.pid") {
+        my $oldPid = `cat /tmp/WebKit/httpd.pid`;
         chomp $oldPid;
         if (0 != kill 0, $oldPid) {
@@ -1435 +1432 @@
     close HTTPDOUT;
 
-    if (! -f $httpdPidFile) {
-        $isHttpdOpen = 0;
-        rmdir $httpdPidDir;
-        return;
-    }
-
-    my $httpdPid = `cat "$httpdPidFile"`;
-    kill 15, $httpdPid;
-    my $retryCount = 20;
-    while ((0 != kill 0, $httpdPid) && $retryCount) {
-        sleep 1;
-        --$retryCount;
-    }
-
-    print STDERR "Timed out waiting for httpd to terminate!\n" unless $retryCount;
-    rmdir $httpdPidDir;
+    kill 15, `cat /tmp/WebKit/httpd.pid` if -f "/tmp/WebKit/httpd.pid";
 
     $isHttpdOpen = 0;