Reviewed by Adam.

        Gets JavaScripCore tests running on windows.

        * Scripts/run-javascriptcore-tests:
        * Scripts/webkitdirs.pm:

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

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 04a98cf3cdf9dd25a556bad1a7569ac788724e89..c8c76476e5adb8bc4434fa0deb9a825a6984c1dc 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2006-10-13  Kevin McCullough  <KMcCullough@apple.com>
+
+        Reviewed by Adam.
+
+        Gets JavaScripCore tests running on windows.
+
+        * Scripts/run-javascriptcore-tests:
+        * Scripts/webkitdirs.pm:
+
 2006-10-12  Nikolas Zimmermann  <zimmermann@kde.org>
 
         Reviewed by Maciej.

diff --git a/WebKitTools/Scripts/run-javascriptcore-tests b/WebKitTools/Scripts/run-javascriptcore-tests
index f0d7aa34431a2b1f6175cf489fd176c5820c7268..9f34d95ae6d9732b7293d92fb6fc84cf72ef1933 100755 (executable)
--- a/WebKitTools/Scripts/run-javascriptcore-tests
+++ b/WebKitTools/Scripts/run-javascriptcore-tests
@@ -41,7 +41,22 @@ chdir "JavaScriptCore/tests/mozilla" or die;
 
 $productDir .= "/JavaScriptCore" if (isQt());
 $ENV{DYLD_FRAMEWORK_PATH} = $productDir;
-my $result = system "perl", "jsDriver.pl", "-e", "kjs", "-s", "$productDir/testkjs", "-f", "actual.html", @ARGV;
+
+my $testkjsName;
+my $configuration;
+sub determineTestkjsName
+{
+    return if $testkjsName;
+    $configuration = configuration();
+    if (isCygwin() && ($configuration eq "Debug")) {
+        $testkjsName = "testkjs_debug";
+    } else {
+        $testkjsName = "testkjs";
+    }
+}
+$testkjsName = determineTestkjsName();
+
+my $result = system "perl", "jsDriver.pl", "-e", "kjs", "-s", "$productDir/$testkjsName", "-f", "actual.html", @ARGV;
 
 exit $result if $result;
 

diff --git a/WebKitTools/Scripts/webkitdirs.pm b/WebKitTools/Scripts/webkitdirs.pm
index 75fe74cf24de34408af62485c79293ad2f1a0e19..8e9b2ce92c7a6f5c744cae52093054553669de4d 100644 (file)
--- a/WebKitTools/Scripts/webkitdirs.pm
+++ b/WebKitTools/Scripts/webkitdirs.pm
@@ -49,7 +49,6 @@ my $configurationProductDir;
 my $sourceDir;
 my $currentSVNRevision;
 
-
 # Variables for Win32 support
 my $devenvPath;
 my $windowsTmpPath;
@@ -81,7 +80,7 @@ sub determineBaseProductDir
             chomp $baseProductDir;
         }
     } else {
-        $baseProductDir = $ENV{"WebKitOutputDir"};
+        $baseProductDir =  $ENV{"WEBKITOUTPUTDIR"};
         if (isCygwin() && $baseProductDir) {
             my $unixBuildPath = `cygpath --unix \"$baseProductDir\"`;
             chomp $unixBuildPath;
@@ -104,7 +103,7 @@ sub determineBaseProductDir
         if (isCygwin()) {
             my $dosBuildPath = `cygpath --windows \"$baseProductDir\"`;
             chomp $dosBuildPath;
-            $ENV{"WebKitOutputDir"} = $dosBuildPath;
+            $ENV{"WEBKITOUTPUTDIR"} = $dosBuildPath;
         }
     }
 }
@@ -131,8 +130,12 @@ sub determineConfigurationProductDir
 {
     return if defined $configurationProductDir;
     determineBaseProductDir();
-    determineConfiguration();
-    $configurationProductDir = "$baseProductDir/$configuration";
+    if(isCygwin()) {
+        $configurationProductDir = "$baseProductDir/bin";
+    } else {
+        determineConfiguration();
+        $configurationProductDir = "$baseProductDir/$configuration";
+    }
 }
 
 sub determineCurrentSVNRevision
@@ -371,7 +374,7 @@ sub setupCygwinEnv()
     $windowsTmpPath = `cygpath -w /tmp`;
     chomp $windowsTmpPath;
     print "Building results into: ", baseProductDir(), "\n";
-    print "WebKitOutputDir is set to: ", $ENV{"WebKitOutputDir"}, "\n";
+    print "WEBKITOUTPUTDIR is set to: ", $ENV{"WEBKITOUTPUTDIR"}, "\n";
 }
 
 sub buildVisualStudioProject($)