[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 101de6516b95e00b38f821b688f3e07bf45c95b4
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 7 19:25:25 2010 +0000

    Unreviewed. Fix the Mac bots. Why is there no HTTPD PID file?
    
    Patch by Andras Becsi <abecsi at inf.u-szeged.hu> on 2010-01-07
    * Scripts/run-webkit-tests:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52934 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 0dc6df6..f74c45a 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,11 @@
 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.
diff --git a/WebKitTools/Scripts/run-webkit-tests b/WebKitTools/Scripts/run-webkit-tests
index 0e41217..3bdf1a3 100755
--- a/WebKitTools/Scripts/run-webkit-tests
+++ b/WebKitTools/Scripts/run-webkit-tests
@@ -1426,8 +1426,8 @@ sub openHTTPDIfNeeded()
     }
     
     die "Timed out waiting for httpd to start" unless $retryCount;
-    open (PIDFILE, $httpdPidFile) || die "Cannot open HTTPD pid file.";
-    $httpdPid = <PIDFILE>;
+
+    $httpdPid = <PIDFILE> if open(PIDFILE, $httpdPidFile);
     chomp $httpdPid if $httpdPid;
     close PIDFILE;
     $isHttpdOpen = 1;

-- 
WebKit Debian packaging