Fix some paths to make http tests work again on Windows

Rubberstamped by Sam.

* Scripts/run-webkit-tests:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@23917 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 06f660f6e66513d25cc0b80c21b95a3ee739cb9c..4762e7f3563ee9476b01d57f3a9191e5fbe765af 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,11 @@
+2007-07-01  Adam Roben  <aroben@apple.com>
+
+        Fix some paths to make http tests work again on Windows
+
+        Rubberstamped by Sam.
+
+        * Scripts/run-webkit-tests:
+
 2007-06-28  Stephanie  <slewis@apple.com>
 
         Reviewed by Adam,

diff --git a/WebKitTools/Scripts/run-webkit-tests b/WebKitTools/Scripts/run-webkit-tests
index 7d47d526172a434ab1bf8797200ecf308762779a..841557eb655eb14aa61baaacf0568fe783c297fc 100755 (executable)
--- a/WebKitTools/Scripts/run-webkit-tests
+++ b/WebKitTools/Scripts/run-webkit-tests
@@ -228,8 +228,8 @@ if (isQt()) {
     $expectedDirectory = "LayoutTests/qt/";
     $platformTestDirectory = $expectedDirectory;
 } elsif (isCygwin()) {
-    $expectedDirectory = "LayoutTests";
-    $platformTestDirectory = "LayoutTests/win/";
+    $expectedDirectory = $testDirectory;
+    $platformTestDirectory = File::Spec->rel2abs("LayoutTests/win/");
 }
 
 $expectedDirectory = $ENV{"WebKitExpectedTestResultsDirectory"} if $ENV{"WebKitExpectedTestResultsDirectory"};
@@ -1078,7 +1078,7 @@ sub openHTTPDIfNeeded()
     my $httpdPath = "/usr/sbin/httpd";
     my $httpdConfig;
     if (isCygwin()) {
-        my $windowsConfDirectory = "$FindBin::Bin/../../OpenSourceWin/LayoutTestsWin/http/conf/";
+        my $windowsConfDirectory = "$testDirectory/http/conf/";
         unless (-x "/usr/lib/apache/libphp4.dll") {
             copy("$windowsConfDirectory/libphp4.dll", "/usr/lib/apache/libphp4.dll");
             chmod(0755, "/usr/lib/apache/libphp4.dll");