Title: [101827] trunk/Tools
- Revision
- 101827
- Author
- [email protected]
- Date
- 2011-12-02 10:47:17 -0800 (Fri, 02 Dec 2011)
Log Message
Make _build_path check more thoroughly that build paths exist.
https://bugs.webkit.org/show_bug.cgi?id=73601
Reviewed by Ojan Vafai.
* Scripts/webkitpy/layout_tests/port/chromium_mac.py:
(ChromiumMacPort._build_path):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (101826 => 101827)
--- trunk/Tools/ChangeLog 2011-12-02 18:44:54 UTC (rev 101826)
+++ trunk/Tools/ChangeLog 2011-12-02 18:47:17 UTC (rev 101827)
@@ -1,3 +1,13 @@
+2011-12-02 Alice Boxhall <[email protected]>
+
+ Make _build_path check more thoroughly that build paths exist.
+ https://bugs.webkit.org/show_bug.cgi?id=73601
+
+ Reviewed by Ojan Vafai.
+
+ * Scripts/webkitpy/layout_tests/port/chromium_mac.py:
+ (ChromiumMacPort._build_path):
+
2011-12-02 Gustavo Noronha Silva <[email protected]>
Add libffi to the jhbuild modules list as a glib dependency.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py (101826 => 101827)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py 2011-12-02 18:44:54 UTC (rev 101826)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py 2011-12-02 18:47:17 UTC (rev 101827)
@@ -159,13 +159,19 @@
return self._filesystem.join(self.get_option('build_directory'),
*comps)
base = self.path_from_chromium_base()
- if self._filesystem.exists(self._filesystem.join(base, 'out')):
- return self._filesystem.join(base, 'out', *comps)
- if self._filesystem.exists(self._filesystem.join(base, 'xcodebuild', *comps)):
- return self._filesystem.join(base, 'xcodebuild', *comps)
+ path = self._filesystem.join(base, 'out', *comps)
+ if self._filesystem.exists(path):
+ return path
+
+ path = self._filesystem.join(base, 'xcodebuild', *comps)
+ if self._filesystem.exists(path):
+ return path
+
base = self.path_from_webkit_base()
- if self._filesystem.exists(self._filesystem.join(base, 'out')):
- return self._filesystem.join(base, 'out', *comps)
+ path = self._filesystem.join(base, 'out', *comps)
+ if self._filesystem.exists(path):
+ return path
+
return self._filesystem.join(base, 'xcodebuild', *comps)
def check_wdiff(self, logging=True):
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
