[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 1fac53c1d4155a8e056ba4fe39097e56ca7eaf1c
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 7 18:33:00 2010 +0000

    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.
    
    Patch by Andras Becsi <abecsi at inf.u-szeged.hu> on 2010-01-07
    Reviewed by Alexey Proskuryakov.
    
    * Scripts/run-webkit-tests:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52932 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 02db3a5..0dc6df6 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+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.
diff --git a/WebKitTools/Scripts/run-webkit-tests b/WebKitTools/Scripts/run-webkit-tests
index e937671..0e41217 100755
--- a/WebKitTools/Scripts/run-webkit-tests
+++ b/WebKitTools/Scripts/run-webkit-tests
@@ -147,6 +147,7 @@ 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 $testsPerDumpTool = 1000;
 my $threaded = 0;
 # DumpRenderTree has an internal timeout of 15 seconds, so this must be > 15.
@@ -1425,7 +1426,10 @@ sub openHTTPDIfNeeded()
     }
     
     die "Timed out waiting for httpd to start" unless $retryCount;
-    
+    open (PIDFILE, $httpdPidFile) || die "Cannot open HTTPD pid file.";
+    $httpdPid = <PIDFILE>;
+    chomp $httpdPid if $httpdPid;
+    close PIDFILE;
     $isHttpdOpen = 1;
 }
 
@@ -1436,10 +1440,6 @@ sub closeHTTPD()
     close HTTPDIN;
     close HTTPDOUT;
 
-    open (PIDFILE, $httpdPidFile);
-    my $httpdPid = <PIDFILE>;
-    chomp $httpdPid;
-    close PIDFILE;
     if ($httpdPid) {
         kill 15, $httpdPid;
         my $retryCount = 20;

-- 
WebKit Debian packaging