Changeset 96235 in webkit

Timestamp:

Sep 28, 2011 10:46:54 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

Let TestWebKitAPI and webkit_unit_tests work for chromium-win
​https://bugs.webkit.org/show_bug.cgi?id=68680

Patch by Xianzhu Wang <​wangxianzhu@chromium.org> on 2011-09-28
Reviewed by Tony Chang.

• Scripts/run-chromium-webkit-unit-tests:
• Scripts/webkitdirs.pm:

(determineBaseProductDir):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/run-chromium-webkit-unit-tests (modified) (1 diff)
• Scripts/webkitdirs.pm (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-09-28  Xianzhu Wang  <wangxianzhu@chromium.org>
+
+        Let TestWebKitAPI and webkit_unit_tests work for chromium-win
+        https://bugs.webkit.org/show_bug.cgi?id=68680
+
+        Reviewed by Tony Chang.
+
+        * Scripts/run-chromium-webkit-unit-tests:
+        * Scripts/webkitdirs.pm:
+        (determineBaseProductDir):
+
 2011-09-28  Kaustubh Atrawalkar  <kaustubh@motorola.com>
 

trunk/Tools/Scripts/run-chromium-webkit-unit-tests

@@ -34 +34 @@
 use webkitdirs;
 
-# Allow running this script from any directory.
-my $sourceRootDir = File::Spec->catfile($FindBin::Bin, "../..");
-chdir($sourceRootDir);
-
+push(@ARGV, "--chromium");
 setConfiguration();
-
-my $pathToBinary;
-if (isDarwin()) {
-    $pathToBinary = "Source/WebKit/chromium/xcodebuild/" . configuration() . "/webkit_unit_tests";
-} elsif (isCygwin() || isWindows()) {
-    $pathToBinary = "Source/WebKit/chromium/" . configuration() . "/webkit_unit_tests.exe";
-} elsif (isLinux()) {
-    $pathToBinary = "out/" . configuration() . "/webkit_unit_tests";
-}
-
+my $pathToBinary = productDir() . "/webkit_unit_tests";
 exit system ($pathToBinary, @ARGV);

trunk/Tools/Scripts/webkitdirs.pm

@@ -162 +162 @@
             $baseProductDir = "$sourceDir/Source/WebKit/chromium/xcodebuild";
         } elsif (isWindows() || isCygwin()) {
-            # FIXME: set the correct baseProductDir for chromium-win.
+            $baseProductDir = "$sourceDir/Source/WebKit/chromium/build";
         }
     }