Title: [174835] trunk/Tools
- Revision
- 174835
- Author
- [email protected]
- Date
- 2014-10-17 14:06:21 -0700 (Fri, 17 Oct 2014)
Log Message
[iOS] Simplify test fallback paths for iOS Simulator testing
https://bugs.webkit.org/show_bug.cgi?id=137830
Reviewed by Zalan Bujtas.
Make the fallback paths be:
ios-simulator -> generic
ios-simulator-wk2->ios-simulator -> generic
so don't include mac in the fallback path. Also remove the
version handling for simplicity.
* Scripts/webkitpy/port/ios.py:
(IOSSimulatorPort):
(IOSSimulatorPort.default_baseline_search_path):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (174834 => 174835)
--- trunk/Tools/ChangeLog 2014-10-17 21:03:40 UTC (rev 174834)
+++ trunk/Tools/ChangeLog 2014-10-17 21:06:21 UTC (rev 174835)
@@ -1,3 +1,21 @@
+2014-10-17 Simon Fraser <[email protected]>
+
+ [iOS] Simplify test fallback paths for iOS Simulator testing
+ https://bugs.webkit.org/show_bug.cgi?id=137830
+
+ Reviewed by Zalan Bujtas.
+
+ Make the fallback paths be:
+ ios-simulator -> generic
+ ios-simulator-wk2->ios-simulator -> generic
+
+ so don't include mac in the fallback path. Also remove the
+ version handling for simplicity.
+
+ * Scripts/webkitpy/port/ios.py:
+ (IOSSimulatorPort):
+ (IOSSimulatorPort.default_baseline_search_path):
+
2014-10-17 Dana Burkart <[email protected]>
Fix typos in the dashboard config file.
Modified: trunk/Tools/Scripts/webkitpy/port/ios.py (174834 => 174835)
--- trunk/Tools/Scripts/webkitpy/port/ios.py 2014-10-17 21:03:40 UTC (rev 174834)
+++ trunk/Tools/Scripts/webkitpy/port/ios.py 2014-10-17 21:06:21 UTC (rev 174835)
@@ -46,8 +46,6 @@
FUTURE_VERSION = 'future'
- VERSION_FALLBACK_ORDER = ['ios-simulator', 'mac']
-
ARCHITECTURES = ['x86_64', 'x86']
relay_name = 'LayoutTestRelay'
@@ -142,15 +140,11 @@
return driver.IOSSimulatorDriver
def default_baseline_search_path(self):
- name = self._name.replace('-wk2', '')
- wk_version = [] if self.get_option('webkit_test_runner') else ['mac-wk1']
- if name.endswith(self.FUTURE_VERSION):
- fallback_names = wk_version + [self.port_name]
- else:
- fallback_names = self.VERSION_FALLBACK_ORDER[self.VERSION_FALLBACK_ORDER.index(name):-1] + wk_version + [self.port_name]
- # FIXME: mac-wk2 should appear at the same place as mac-wk1.
if self.get_option('webkit_test_runner'):
- fallback_names = [self._wk2_port_name(), 'wk2'] + fallback_names
+ fallback_names = [self.port_name + '_wk2'] + [self.port_name]
+ else:
+ fallback_names = [self.port_name]
+
return map(self._webkit_baseline_path, fallback_names)
def _port_specific_expectations_files(self):
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
