Changeset 125398 in webkit

Timestamp:

Aug 13, 2012 1:26:15 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL][WK2] Replace Skipped list by TestExpectations
​https://bugs.webkit.org/show_bug.cgi?id=93796

Patch by Christophe Dumez <Christophe Dumez> on 2012-08-13
Reviewed by Kenneth Rohde Christiansen.

Tools:

Enable cascaded TestExpectations for EFL port so
that we can use TestExpectations in WK2-EFL.

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

(EflPort._search_paths):
(EflPort):
(EflPort.expectations_files):

LayoutTests:

Replace efl-wk2 Skipped file by TestExpectations now
that we support cascaded TestExpectations in EFL
port.

• platform/efl-wk2/Skipped: Removed.
• platform/efl-wk2/TestExpectations: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/efl-wk2/Skipped (deleted)
• LayoutTests/platform/efl-wk2/TestExpectations (added)
• Tools/ChangeLog (modified) (1 diff)
• Tools/Scripts/webkitpy/layout_tests/port/efl.py (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-08-13  Christophe Dumez  <christophe.dumez@intel.com>
+
+        [EFL][WK2] Replace Skipped list by TestExpectations
+        https://bugs.webkit.org/show_bug.cgi?id=93796
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Replace efl-wk2 Skipped file by TestExpectations now
+        that we support cascaded TestExpectations in EFL
+        port.
+
+        * platform/efl-wk2/Skipped: Removed.
+        * platform/efl-wk2/TestExpectations: Added.
+
 2012-08-13  Shinya Kawanaka  <shinyak@chromium.org>
 

trunk/Tools/ChangeLog

@@ +1 @@
+2012-08-13  Christophe Dumez  <christophe.dumez@intel.com>
+
+        [EFL][WK2] Replace Skipped list by TestExpectations
+        https://bugs.webkit.org/show_bug.cgi?id=93796
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Enable cascaded TestExpectations for EFL port so
+        that we can use TestExpectations in WK2-EFL.
+
+        * Scripts/webkitpy/layout_tests/port/efl.py:
+        (EflPort._search_paths):
+        (EflPort):
+        (EflPort.expectations_files):
+
 2012-08-13  Peter Gal  <galpeter@inf.u-szeged.hu>
 

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

@@ -95 +95 @@
         return static_path if self._filesystem.exists(static_path) else dyn_path
 
+    def _search_paths(self):
+        search_paths = []
+        if self.get_option('webkit_test_runner'):
+            search_paths.append(self.port_name + '-wk2')
+        search_paths.append(self.port_name)
+        return search_paths
+
+    def expectations_files(self):
+        return list(reversed([self._filesystem.join(self._webkit_baseline_path(p), 'TestExpectations') for p in self._search_paths()]))
+
     def show_results_html_file(self, results_filename):
         # FIXME: We should find a way to share this implmentation with Gtk,