Changeset 139679 in webkit

Timestamp:

Jan 14, 2013, 3:50:42 PM (12 years ago)

Author:

dpranke@chromium.org

Message:

nrwt: use the same search path for baselines and TestExpectations on apple mac
​https://bugs.webkit.org/show_bug.cgi?id=105599

Reviewed by Ryosuke Niwa.

Bug 105583 revealed some confusion due to the fact that the Apple
Mac port used a different list of directories to search for baselines
and TestExpectations files (actually, pretty much every port does).

It seems like a good idea to use the same list for both by default, but
making this happen will affect every port in slightly different ways, so
we'll try this on the Apple Mac port first.

Note that the effective changes for this are that:
1) The apple mac port will look in platform/wk2 for baselines where
it didn't before (it will look after looking in mac-wk2 but before
the non-wk2 dirs)
2) The apple mac-snowleopard port will use the expectations in
mac-lion as well as the expectations in mac-snowleopard, although
I'm not even sure if mac-snowleopard is still supported ...

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

(MacPort.default_baseline_search_path):
(MacPort.expectations_files):

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

(test_baseline_search_path):

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2013-01-14  Dirk Pranke  <dpranke@chromium.org>
+
+        nrwt: use the same search path for baselines and TestExpectations on apple mac
+        https://bugs.webkit.org/show_bug.cgi?id=105599
+
+        Reviewed by Ryosuke Niwa.
+
+        Bug 105583 revealed some confusion due to the fact that the Apple
+        Mac port used a different list of directories to search for baselines
+        and TestExpectations files (actually, pretty much every port does).
+
+        It seems like a good idea to use the same list for both by default, but
+        making this happen will affect every port in slightly different ways, so
+        we'll try this on the Apple Mac port first.
+
+        Note that the effective changes for this are that:
+        1) The apple mac port will look in platform/wk2 for baselines where
+        it didn't before (it will look after looking in mac-wk2 but before
+        the non-wk2 dirs)
+        2) The apple mac-snowleopard port will use the expectations in
+        mac-lion as well as the expectations in mac-snowleopard, although
+        I'm not even sure if mac-snowleopard is still supported ...
+
+        * Scripts/webkitpy/layout_tests/port/mac.py:
+        (MacPort.default_baseline_search_path):
+        (MacPort.expectations_files):
+        * Scripts/webkitpy/layout_tests/port/mac_unittest.py:
+        (test_baseline_search_path):
+
 2013-01-14  Dominic Mazzoni  <dmazzoni@google.com>
 

trunk/Tools/Scripts/webkitpy/layout_tests/port/mac.py

@@ -80 +80 @@
             fallback_names = self.VERSION_FALLBACK_ORDER[self.VERSION_FALLBACK_ORDER.index(name):-1] + [self.port_name]
         if self.get_option('webkit_test_runner'):
-            fallback_names.insert(0, self._wk2_port_name())
-            # Note we do not add 'wk2' here, even though it's included in _skipped_search_paths().
+            fallback_names = [self._wk2_port_name(), 'wk2'] + fallback_names
         return map(self._webkit_baseline_path, fallback_names)
+
+    def expectations_files(self):
+        return reversed([self._filesystem.join(self._webkit_baseline_path(d), 'TestExpectations') for d in self.baseline_search_path()])
 
     def setup_environ_for_server(self, server_name=None):

trunk/Tools/Scripts/webkitpy/layout_tests/port/mac_unittest.py

@@ -131 +131 @@
         self._assert_search_path('mac-mountainlion', 'mac', ['mac'])
         self._assert_search_path('mac-future', 'mac', ['mac'])
-        self._assert_search_path('mac-snowleopard', 'mac-wk2', ['mac-wk2', 'mac-snowleopard', 'mac-lion', 'mac'], use_webkit2=True)
-        self._assert_search_path('mac-lion', 'mac-wk2', ['mac-wk2', 'mac-lion', 'mac'], use_webkit2=True)
-        self._assert_search_path('mac-mountainlion', 'mac-wk2', ['mac-wk2', 'mac'], use_webkit2=True)
-        self._assert_search_path('mac-future', 'mac-wk2', ['mac-wk2', 'mac'], use_webkit2=True)
+        self._assert_search_path('mac-snowleopard', 'mac-wk2', ['mac-wk2', 'wk2', 'mac-snowleopard', 'mac-lion', 'mac'], use_webkit2=True)
+        self._assert_search_path('mac-lion', 'mac-wk2', ['mac-wk2', 'wk2', 'mac-lion', 'mac'], use_webkit2=True)
+        self._assert_search_path('mac-mountainlion', 'mac-wk2', ['mac-wk2', 'wk2', 'mac'], use_webkit2=True)
+        self._assert_search_path('mac-future', 'mac-wk2', ['mac-wk2', 'wk2', 'mac'], use_webkit2=True)
 
     def test_show_results_html_file(self):