Add support for test_expectations_android.txt for overriding test expecations on...

https://bugs.webkit.org/show_bug.cgi?id=89791

Reviewed by Dirk Pranke.

Downstream, the chromium-android port maintains a test expectations
file to keep track of which tests pass or fail. That causes them to
keep a patch in chromium_android.py in their branch.

This patch teaches chromium_android.py to use test_expectations_android.txt.
We don't intend to use this file upstream, but having this code patch
upstream lets us unfork webkitpy.

* Scripts/webkitpy/layout_tests/port/chromium_android.py:
(ChromiumAndroidPort.expectations_files):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@121074 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/platform/chromium/test_expectations_android.txt b/LayoutTests/platform/chromium/test_expectations_android.txt
new file mode 100644 (file)
index 0000000..a64a83d
--- /dev/null
+++ b/LayoutTests/platform/chromium/test_expectations_android.txt
@@ -0,0 +1,4 @@
+// This file should remain empty. It is used by the chromium-android port in
+// its downstream repository to manage test expecations downstream. Rather than
+// add expectations to this file upstream, please add them to the normal
+// TestExpectations file with the ANDROID keyword.

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 0015b27..481d6a2 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,21 @@
+2012-06-22  Adam Barth  <abarth@webkit.org>
+
+        Add support for test_expectations_android.txt for overriding test expecations on the chromium-android branch
+        https://bugs.webkit.org/show_bug.cgi?id=89791
+
+        Reviewed by Dirk Pranke.
+
+        Downstream, the chromium-android port maintains a test expectations
+        file to keep track of which tests pass or fail. That causes them to
+        keep a patch in chromium_android.py in their branch.
+
+        This patch teaches chromium_android.py to use test_expectations_android.txt.
+        We don't intend to use this file upstream, but having this code patch
+        upstream lets us unfork webkitpy.
+
+        * Scripts/webkitpy/layout_tests/port/chromium_android.py:
+        (ChromiumAndroidPort.expectations_files):
+
 2012-06-22  Dirk Pranke  <dpranke@chromium.org>
 
         run_webkit_tests.py failed with AttributeError(''NoneType' object has no attribute 'pid'')

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py b/Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py
index 6568692..fd0fba6 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py
@@ -210,6 +210,11 @@ class ChromiumAndroidPort(chromium.ChromiumPort):
                 return False
         return True
 
+    # FIXME: Remove this function when chromium-android is fully upstream.
+    def expectations_files(self):   
+        android_expectations_file = self.path_from_webkit_base('LayoutTests', 'platform', 'chromium', 'test_expectations_android.txt')
+        return super(ChromiumAndroidPort, self).expectations_files() + [android_expectations_file]
+
     def test_expectations(self):
         # Automatically apply all expectation rules of chromium-linux to
         # chromium-android.