Changeset 112176 in webkit

Timestamp:

Mar 26, 2012 4:53:59 PM (12 years ago)

Author:

enne@google.com

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):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/base.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/test.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-03-26  Adrienne Walker  <enne@google.com>
+
+        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  <dpranke@chromium.org>
 

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

@@ -1091 +1091 @@
         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
 

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

@@ -404 +404 @@
         # 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):
@@ -489 +490 @@
         return [
             VirtualTestSuite('virtual/passes', 'passes', ['--virtual-arg']),
+            VirtualTestSuite('virtual/skipped', 'failures/expected', ['--virtual-arg2']),
         ]