Changeset 83129 in webkit

Timestamp:

Apr 6, 2011 6:37:24 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-04-06 Scott Cameron <​sccameron@rim.com>

Reviewed by Eric Seidel.

Remove global variable $httpdPath and replace with the return value of
getHTTPDPath(). Also remove unnecessary calls to getHTTPDPath().
​https://bugs.webkit.org/show_bug.cgi?id=53499

• Scripts/run-iexploder-tests:
• Scripts/webkitperl/httpd.pm:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/run-iexploder-tests (modified) (1 diff)
• Scripts/webkitperl/httpd.pm (modified) (4 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-04-06  Scott Cameron  <sccameron@rim.com>
+
+        Reviewed by Eric Seidel.
+
+        Remove global variable $httpdPath and replace with the return value of
+        getHTTPDPath().  Also remove unnecessary calls to getHTTPDPath().
+        https://bugs.webkit.org/show_bug.cgi?id=53499
+
+        * Scripts/run-iexploder-tests:
+        * Scripts/webkitperl/httpd.pm:
+
 2011-04-06  Kevin Ollivier  <kevino@theolliviers.com>
 

trunk/Tools/Scripts/run-iexploder-tests

@@ -115 +115 @@
     return if $isHttpdOpen;
     mkdir $iExploderTestDirectory;
-    my $httpdPath = getHTTPDPath();
     my $webkitDirectory = getcwd();
     my $testDirectory = $webkitDirectory . "/LayoutTests";

trunk/Tools/Scripts/webkitperl/httpd.pm

@@ -64 +64 @@
 my $myLockFile;
 my $exclusiveLockFile = File::Spec->catfile($tmpDir, "WebKit.lock");
-my $httpdPath;
 my $httpdPidDir = File::Spec->catfile($tmpDir, "WebKit");
 my $httpdPidFile = File::Spec->catfile($httpdPidDir, "httpd.pid");
@@ -77 +76 @@
 sub getHTTPDPath
 {
+    my $httpdPath;
     if (isDebianBased()) {
         $httpdPath = "/usr/sbin/apache2";
@@ -131 +131 @@
     die "No test directory has been specified." unless ($testDirectory);
     my $httpdConfig;
-    getHTTPDPath();
+    my $httpdPath = getHTTPDPath();
     if (isCygwin()) {
         my $windowsConfDirectory = "$testDirectory/http/conf/";
@@ -174 +174 @@
     }
 
-    $httpdPath = "/usr/sbin/httpd" unless ($httpdPath);
+    my $httpdPath = getHTTPDPath();
 
     open2(">&1", \*HTTPDIN, $httpdPath, @args);