Title: [109490] trunk/Tools
- Revision
- 109490
- Author
- [email protected]
- Date
- 2012-03-01 19:28:12 -0800 (Thu, 01 Mar 2012)
Log 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):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (109489 => 109490)
--- trunk/Tools/ChangeLog 2012-03-02 03:28:08 UTC (rev 109489)
+++ trunk/Tools/ChangeLog 2012-03-02 03:28:12 UTC (rev 109490)
@@ -1,3 +1,21 @@
+2012-03-01 Dirk Pranke <[email protected]>
+
+ 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 <[email protected]>
run-perf-tests should report the test runtime
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py (109489 => 109490)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py 2012-03-02 03:28:08 UTC (rev 109489)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/base.py 2012-03-02 03:28:12 UTC (rev 109490)
@@ -1078,9 +1078,12 @@
def _virtual_tests(self, paths, suites):
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
def lookup_virtual_test_base(self, test_name):
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/base_unittest.py (109489 => 109490)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/base_unittest.py 2012-03-02 03:28:08 UTC (rev 109489)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/base_unittest.py 2012-03-02 03:28:12 UTC (rev 109490)
@@ -438,6 +438,20 @@
self.assertFalse(port.test_isdir('virtual/does_not_exist/'))
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__':
unittest.main()
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/test.py (109489 => 109490)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/test.py 2012-03-02 03:28:08 UTC (rev 109489)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/test.py 2012-03-02 03:28:12 UTC (rev 109490)
@@ -495,7 +495,6 @@
def virtual_test_suites(self):
return [
VirtualTestSuite('virtual/passes', 'passes', ['--virtual-arg']),
- VirtualTestSuite('virtual/failures', 'failures/expected', ['--virtual-arg']),
]
class TestDriver(Driver):
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
