Changeset 57437 in webkit

Timestamp:

Apr 10, 2010 10:10:51 PM (14 years ago)

Author:

abarth@webkit.org

Message:

2010-04-10 Adam Barth <​abarth@webkit.org>

Reviewed by Eric Seidel.

new-run-webkit-tests can't find ImageDiff on Windows
​https://bugs.webkit.org/show_bug.cgi?id=37403

It turns out the build directory on Windows is structured differently
than it is on other platforms. Instead of assuming the normal
structure, we should just ask perl to figure it out for us.

• Scripts/webkitpy/layout_tests/port/webkit.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/webkit.py (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-04-10  Adam Barth  <abarth@webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        new-run-webkit-tests can't find ImageDiff on Windows
+        https://bugs.webkit.org/show_bug.cgi?id=37403
+
+        It turns out the build directory on Windows is structured differently
+        than it is on other platforms.  Instead of assuming the normal
+        structure, we should just ask perl to figure it out for us.
+
+        * Scripts/webkitpy/layout_tests/port/webkit.py:
+
 2010-04-10  Adam Barth  <abarth@webkit.org>
 

trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/webkit.py

@@ -307 +307 @@
     def _build_path(self, *comps):
         if not self._cached_build_root:
-            self._cached_build_root = self._webkit_build_directory(["--top-level"])
-        return os.path.join(self._cached_build_root, self._options.configuration,
-                            *comps)
+            self._cached_build_root = self._webkit_build_directory([
+                "--configuration",
+                self.flag_from_configuration(self._options.configuration),
+            ])
+        return os.path.join(self._cached_build_root, *comps)
 
     def _path_to_driver(self):