[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 5eca6396b5b2a38fde07c971612f3b31299196f2
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 6 23:56:15 2010 +0000

    2010-01-06  Eric Seidel  <eric at 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:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52876 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 4e786e9..10c154a 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,17 @@
 2010-01-06  Eric Seidel  <eric at 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 at webkit.org>
+
         Unreviewed "build" fix.  Just adding missing include.
 
         bugzilla-tool rollout --complete-rollout should make a nicer bug comment
diff --git a/WebKitTools/Scripts/run-webkit-tests b/WebKitTools/Scripts/run-webkit-tests
index b3ea274..74766f0 100755
--- a/WebKitTools/Scripts/run-webkit-tests
+++ b/WebKitTools/Scripts/run-webkit-tests
@@ -143,10 +143,7 @@ my $showHelp = 0;
 my $stripEditingCallbacks = isCygwin();
 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;
 # DumpRenderTree has an internal timeout of 15 seconds, so this must be > 15.
@@ -404,7 +401,7 @@ if ($pixelTests) {
     }
 }
 
-system "ln", "-s", $testDirectory, $layoutTestsSymLink unless -x $layoutTestsSymLink;
+system "ln", "-s", $testDirectory, "/tmp/LayoutTests" unless -x "/tmp/LayoutTests";
 
 my %ignoredFiles = ( "results.html" => 1 );
 my %ignoredDirectories = map { $_ => 1 } qw(platform);
@@ -1352,10 +1349,10 @@ sub openHTTPDIfNeeded()
 {
     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) {
             print "\nhttpd is already running: pid $oldPid, killing...\n";
@@ -1434,22 +1431,7 @@ sub closeHTTPD()
     close HTTPDIN;
     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;
 }

-- 
WebKit Debian packaging