Title: [120272] trunk/Tools
- Revision
- 120272
- Author
- [email protected]
- Date
- 2012-06-13 20:47:34 -0700 (Wed, 13 Jun 2012)
Log Message
REGRESSION (r120252): run-webkit-tests on Mac fails
https://bugs.webkit.org/show_bug.cgi?id=89057
Reviewed by Dan Bernstein.
get_option will happily return None (the default only kicks in if
the option is actually *not set*). We should instead check get_option's
return value and default to "x86_64" architecture ourselves.
* Scripts/webkitpy/layout_tests/port/mac.py:
(MacPort.__init__):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (120271 => 120272)
--- trunk/Tools/ChangeLog 2012-06-14 03:40:20 UTC (rev 120271)
+++ trunk/Tools/ChangeLog 2012-06-14 03:47:34 UTC (rev 120272)
@@ -1,3 +1,17 @@
+2012-06-13 Tim Horton <[email protected]>
+
+ REGRESSION (r120252): run-webkit-tests on Mac fails
+ https://bugs.webkit.org/show_bug.cgi?id=89057
+
+ Reviewed by Dan Bernstein.
+
+ get_option will happily return None (the default only kicks in if
+ the option is actually *not set*). We should instead check get_option's
+ return value and default to "x86_64" architecture ourselves.
+
+ * Scripts/webkitpy/layout_tests/port/mac.py:
+ (MacPort.__init__):
+
2012-06-13 Ian Vollick <[email protected]>
[chromium] Certain settings in CCSettings could be global
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/mac.py (120271 => 120272)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/mac.py 2012-06-14 03:40:20 UTC (rev 120271)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/mac.py 2012-06-14 03:47:34 UTC (rev 120272)
@@ -53,7 +53,11 @@
def __init__(self, host, port_name, **kwargs):
ApplePort.__init__(self, host, port_name, **kwargs)
- self._architecture = self.get_option('architecture', 'x86_64')
+ self._architecture = self.get_option('architecture')
+
+ if not self._architecture:
+ self._architecture = 'x86_64'
+
self._leak_detector = LeakDetector(self)
if self.get_option("leaks"):
# DumpRenderTree slows down noticably if we run more than about 1000 tests in a batch
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
