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

[ossy at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 5ada276adf0af57a37eb9023d55cde7f5741cd65
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 7 20:18:23 2010 +0000

    Unreviewed. roll-out r52917, r52932 and r52934.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52939 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index f74c45a..2f5a913 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,18 +1,3 @@
-2010-01-07  Andras Becsi  <abecsi at inf.u-szeged.hu>
-
-        Unreviewed. Fix the Mac bots. Why is there no HTTPD PID file?
-
-        * Scripts/run-webkit-tests:
-
-2010-01-07  Andras Becsi  <abecsi at inf.u-szeged.hu>
-
-        Reviewed by Alexey Proskuryakov.
-
-        Store HTTPD PID in a variable to fix warnings if for some reason the pidfile gets deleted before httpd terminates.
-        This should fix the occasional warnings for uninitialized values on the Mac bots.
-
-        * Scripts/run-webkit-tests:
-
 2010-01-07  Kim Grönholm  <kim.gronholm at nomovok.com>
 
         Reviewed by Antti Koivisto.
@@ -26,17 +11,6 @@
         (EventSender::clearTouchPoints):
         * DumpRenderTree/qt/EventSenderQt.h:
 
-2010-01-07  Andras Becsi  <abecsi at inf.u-szeged.hu>
-
-        Reviewed by Kenneth Rohde Christiansen.
-
-        Reworked r52853 after r52876 rolled it out.
-        Chomp the pid variable before passing it to kill and read the contents of
-        the pidfile in a platform independent manner.
-        First pach of https://bugs.webkit.org/show_bug.cgi?id=33153.
-
-        * Scripts/run-webkit-tests:
-
 2010-01-07  Chris Jerdonek  <chris.jerdonek at gmail.com>
 
         Reviewed by Adam Barth.
diff --git a/WebKitTools/Scripts/run-webkit-tests b/WebKitTools/Scripts/run-webkit-tests
index 3bdf1a3..74766f0 100755
--- a/WebKitTools/Scripts/run-webkit-tests
+++ b/WebKitTools/Scripts/run-webkit-tests
@@ -143,11 +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 $httpdPid;
+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.
@@ -405,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);
@@ -1353,13 +1349,11 @@ sub openHTTPDIfNeeded()
 {
     return if $isHttpdOpen;
 
-    mkdir($httpdPidDir, 0755);
-
-    if (-f $httpdPidFile) {
-        open (PIDFILE, $httpdPidFile);
-        my $oldPid = <PIDFILE>;
+    mkdir "/tmp/WebKit";
+    
+    if (-f "/tmp/WebKit/httpd.pid") {
+        my $oldPid = `cat /tmp/WebKit/httpd.pid`;
         chomp $oldPid;
-        close PIDFILE;
         if (0 != kill 0, $oldPid) {
             print "\nhttpd is already running: pid $oldPid, killing...\n";
             kill 15, $oldPid;
@@ -1426,10 +1420,7 @@ sub openHTTPDIfNeeded()
     }
     
     die "Timed out waiting for httpd to start" unless $retryCount;
-
-    $httpdPid = <PIDFILE> if open(PIDFILE, $httpdPidFile);
-    chomp $httpdPid if $httpdPid;
-    close PIDFILE;
+    
     $isHttpdOpen = 1;
 }
 
@@ -1440,17 +1431,7 @@ sub closeHTTPD()
     close HTTPDIN;
     close HTTPDOUT;
 
-    if ($httpdPid) {
-        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