Title: [121074] trunk
- Revision
- 121074
- Author
- [email protected]
- Date
- 2012-06-22 16:40:26 -0700 (Fri, 22 Jun 2012)
Log Message
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):
Modified Paths
Added Paths
Diff
Added: trunk/LayoutTests/platform/chromium/test_expectations_android.txt (0 => 121074)
--- trunk/LayoutTests/platform/chromium/test_expectations_android.txt (rev 0)
+++ trunk/LayoutTests/platform/chromium/test_expectations_android.txt 2012-06-22 23:40:26 UTC (rev 121074)
@@ -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.
Modified: trunk/Tools/ChangeLog (121073 => 121074)
--- trunk/Tools/ChangeLog 2012-06-22 23:32:59 UTC (rev 121073)
+++ trunk/Tools/ChangeLog 2012-06-22 23:40:26 UTC (rev 121074)
@@ -1,3 +1,21 @@
+2012-06-22 Adam Barth <[email protected]>
+
+ 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 <[email protected]>
run_webkit_tests.py failed with AttributeError(''NoneType' object has no attribute 'pid'')
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py (121073 => 121074)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py 2012-06-22 23:32:59 UTC (rev 121073)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py 2012-06-22 23:40:26 UTC (rev 121074)
@@ -210,6 +210,11 @@
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.
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
