Changeset 109490 in webkit

Timestamp:

Mar 1, 2012 7:28:12 PM (12 years ago)

Author:

dpranke@chromium.org

Message:

nrwt: virtual tests aren't being run
​https://bugs.webkit.org/show_bug.cgi?id=80083

Reviewed by Eric Seidel.

If we tried to run all of the tests by default (and
didn't specify any paths), the virtual tests weren't
picked up.

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

(Port._virtual_tests):

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

(PortTest.test_tests):

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

(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/base_unittest.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/test.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-03-01  Dirk Pranke  <dpranke@chromium.org>
+
+        nrwt: virtual tests aren't being run
+        https://bugs.webkit.org/show_bug.cgi?id=80083
+
+        Reviewed by Eric Seidel.
+
+        If we tried to run all of the tests by default (and
+        didn't specify any paths), the virtual tests weren't
+        picked up.
+
+        * Scripts/webkitpy/layout_tests/port/base.py:
+        (Port._virtual_tests):
+        * Scripts/webkitpy/layout_tests/port/base_unittest.py:
+        (PortTest.test_tests):
+        * Scripts/webkitpy/layout_tests/port/test.py:
+        (TestPort.virtual_test_suites):
+
 2012-03-01  Ryosuke Niwa  <rniwa@webkit.org>
 

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

@@ -1079 +1079 @@
         virtual_tests = set()
         for suite in suites:
-            for test in suite.tests:
-                if any(test.startswith(p) for p in paths):
-                    virtual_tests.add(test)
+            if paths:
+                for test in suite.tests:
+                    if any(test.startswith(p) for p in paths):
+                        virtual_tests.add(test)
+            else:
+                virtual_tests.update(set(suite.tests.keys()))
         return virtual_tests
 

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

@@ -439 +439 @@
         self.assertFalse(port.test_isdir('virtual/passes/text.html'))
 
+    def test_tests(self):
+        port = self.make_port(with_tests=True)
+        tests = port.tests([])
+        self.assertTrue('passes/text.html' in tests)
+        self.assertTrue('virtual/passes/text.html' in tests)
+
+        tests = port.tests(['passes'])
+        self.assertTrue('passes/text.html' in tests)
+        self.assertFalse('virtual/passes/text.html' in tests)
+
+        tests = port.tests(['virtual/passes'])
+        self.assertFalse('passes/text.html' in tests)
+        self.assertTrue('virtual/passes/text.html' in tests)
+
 
 if __name__ == '__main__':

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

@@ -496 +496 @@
         return [
             VirtualTestSuite('virtual/passes', 'passes', ['--virtual-arg']),
-            VirtualTestSuite('virtual/failures', 'failures/expected', ['--virtual-arg']),
         ]