Changeset 181131 in webkit

Timestamp:

Mar 5, 2015 8:04:29 PM (9 years ago)

Author:

ddkilzer@apple.com

Message:

[iOS] TestExpectations for ios-simulator-wk2 should fall back to 'wk2' after 'ios-simulator'
<​http://webkit.org/b/142226>

Reviewed by Darin Adler.

• Scripts/webkitpy/port/ios.py:

(IOSSimulatorPort.default_baseline_search_path): Switch the
TestExpectations order of ios-simulator-wk2 from this:

ios-simulator-wk2, wk2, ios-simulator

To this:

ios-simulator-wk2, ios-simualtor, wk2

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2015-03-05  David Kilzer  <ddkilzer@apple.com>
+
+        [iOS] TestExpectations for ios-simulator-wk2 should fall back to 'wk2' after 'ios-simulator'
+        <http://webkit.org/b/142226>
+
+        Reviewed by Darin Adler.
+
+        * Scripts/webkitpy/port/ios.py:
+        (IOSSimulatorPort.default_baseline_search_path): Switch the
+        TestExpectations order of ios-simulator-wk2 from this:
+          ios-simulator-wk2, wk2, ios-simulator
+        To this:
+          ios-simulator-wk2, ios-simualtor, wk2
+
 2015-03-05  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Tools/Scripts/webkitpy/port/ios.py

@@ -194 +194 @@
     def default_baseline_search_path(self):
         if self.get_option('webkit_test_runner'):
-            fallback_names = [self._wk2_port_name(), 'wk2'] + [self.port_name]
+            fallback_names = [self._wk2_port_name()] + [self.port_name] + ['wk2']
         else:
             fallback_names = [self.port_name + '-wk1'] + [self.port_name]