Title: [112176] trunk/Tools
- Revision
- 112176
- Author
- [email protected]
- Date
- 2012-03-26 16:53:59 -0700 (Mon, 26 Mar 2012)
Log Message
Allow expectations on directories in virtual test suites
https://bugs.webkit.org/show_bug.cgi?id=82250
Reviewed by Dirk Pranke.
lookup_virtual_test_base was only returning valid results for files
and not directories. Fix by falling back to the virtual test suite
mapping if possible.
* Scripts/webkitpy/layout_tests/port/base.py:
(Port.lookup_virtual_test_base):
* Scripts/webkitpy/layout_tests/port/test.py:
(TestPort.skipped_tests):
(TestPort.virtual_test_suites):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (112175 => 112176)
--- trunk/Tools/ChangeLog 2012-03-26 23:42:17 UTC (rev 112175)
+++ trunk/Tools/ChangeLog 2012-03-26 23:53:59 UTC (rev 112176)
@@ -1,3 +1,20 @@
+2012-03-26 Adrienne Walker <[email protected]>
+
+ Allow expectations on directories in virtual test suites
+ https://bugs.webkit.org/show_bug.cgi?id=82250
+
+ Reviewed by Dirk Pranke.
+
+ lookup_virtual_test_base was only returning valid results for files
+ and not directories. Fix by falling back to the virtual test suite
+ mapping if possible.
+
+ * Scripts/webkitpy/layout_tests/port/base.py:
+ (Port.lookup_virtual_test_base):
+ * Scripts/webkitpy/layout_tests/port/test.py:
+ (TestPort.skipped_tests):
+ (TestPort.virtual_test_suites):
+
2012-03-26 Dirk Pranke <[email protected]>
Fix duplicated ChangeLog entry from r112171.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py (112175 => 112176)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py 2012-03-26 23:42:17 UTC (rev 112175)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py 2012-03-26 23:53:59 UTC (rev 112176)
@@ -1090,7 +1090,7 @@
def lookup_virtual_test_base(self, test_name):
for suite in self.populated_virtual_test_suites():
if test_name.startswith(suite.name):
- return suite.tests.get(test_name)
+ return test_name.replace(suite.name, suite.base)
return None
def lookup_virtual_test_args(self, test_name):
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/test.py (112175 => 112176)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/test.py 2012-03-26 23:42:17 UTC (rev 112175)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/test.py 2012-03-26 23:53:59 UTC (rev 112176)
@@ -403,7 +403,8 @@
# This allows us to test the handling Skipped files, both with a test
# that actually passes, and a test that does fail.
return set(['failures/expected/skip_text.html',
- 'failures/unexpected/skip_pass.html'])
+ 'failures/unexpected/skip_pass.html',
+ 'virtual/skipped'])
def name(self):
return self._name
@@ -488,6 +489,7 @@
def virtual_test_suites(self):
return [
VirtualTestSuite('virtual/passes', 'passes', ['--virtual-arg']),
+ VirtualTestSuite('virtual/skipped', 'failures/expected', ['--virtual-arg2']),
]
class TestDriver(Driver):
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
