Changeset 76045 in webkit

Timestamp:

Jan 18, 2011 12:32:22 PM (13 years ago)

Author:

dpranke@chromium.org

Message:

2011-01-18 Dirk Pranke <​dpranke@chromium.org>

Reviewed by Mihai Parparita.

new-run-webkit-tests shouldn't crash when you try to run a
directory containing only skipped files.

​https://bugs.webkit.org/show_bug.cgi?id=52478

• Scripts/webkitpy/layout_tests/layout_package/test_runner.py:
• Scripts/webkitpy/layout_tests/port/test.py:
• Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py:

Location:

trunk/Tools

Files:

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

trunk/Tools/ChangeLog

@@ +1 @@
+2011-01-18  Dirk Pranke  <dpranke@chromium.org>
+
+        Reviewed by Mihai Parparita.
+
+        new-run-webkit-tests shouldn't crash when you try to run a
+        directory containing only skipped files.
+
+        https://bugs.webkit.org/show_bug.cgi?id=52478
+        
+        * Scripts/webkitpy/layout_tests/layout_package/test_runner.py:
+        * Scripts/webkitpy/layout_tests/port/test.py:
+        * Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py:
+
 2011-01-18  Adam Bergkvist  <adam.bergkvist@ericsson.com> and Martin Robinson  <mrobinson@igalia.com>
 

trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/test_runner.py

@@ -200 +200 @@
 
         """
-        paths = [self._strip_test_dir_prefix(arg) for arg in args if arg and arg != '']
+        paths = self._strip_test_dir_prefixes(args)
         paths += last_unexpected_results
         if self._options.test_list:
-            paths += read_test_files(self._options.test_list)
+            paths += self._strip_test_dir_prefixes(read_test_files(self._options.test_list))
         self._test_files = self._port.tests(paths)
+
+    def _strip_test_dir_prefixes(self, paths):
+        return [self._strip_test_dir_prefix(path) for path in paths if path]
 
     def _strip_test_dir_prefix(self, path):
@@ -390 +393 @@
                 result_summary.add(result, expected=True)
         self._printer.print_expected('')
+
+        # Check to make sure we didn't filter out all of the tests.
+        if not len(self._test_files):
+            _log.info("All tests are being skipped")
+            return None
 
         return result_summary

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

@@ -214 +214 @@
     def layout_tests_dir(self):
         return self.path_from_webkit_base('Tools', 'Scripts',
-                                          'webkitpy', 'layout_tests', 'data')
+                                          'webkitpy', 'layout_tests', 'data', 'LayoutTests')
 
     def path_isdir(self, path):

trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py

@@ -316 +316 @@
         self.assertEquals(['passes/text.html'], tests_run)
 
+    def test_single_file_with_prefix(self):
+        tests_run = get_tests_run(['LayoutTests/passes/text.html'], tests_included=True, flatten_batches=True)
+        self.assertEquals(['passes/text.html'], tests_run)
+
+    def test_single_skipped_file(self):
+        tests_run = get_tests_run(['failures/expected/keybaord.html'], tests_included=True, flatten_batches=True)
+        self.assertEquals([], tests_run)
+
     def test_test_list(self):
         filename = tempfile.mktemp()
@@ -328 +336 @@
         self.assertEqual(res, -1)
         self.assertFalse(err.empty())
+
+    def test_test_list_with_prefix(self):
+        filename = tempfile.mktemp()
+        tmpfile = file(filename, mode='w+')
+        tmpfile.write('LayoutTests/passes/text.html')
+        tmpfile.close()
+        tests_run = get_tests_run(['--test-list=%s' % filename], tests_included=True, flatten_batches=True)
+        self.assertEquals(['passes/text.html'], tests_run)
 
     def test_unexpected_failures(self):