Changeset 130381 in webkit

Timestamp:

Oct 4, 2012, 3:18:54 AM (13 years ago)

Author:

dpranke@chromium.org

Message:

[NRWT] --skipped option is ignored when --test-list is used
​https://bugs.webkit.org/show_bug.cgi?id=98260

Reviewed by Ojan Vafai.

Adds a --skipped=always flag that will skip any tests listed in
TestExpectations even if they're listed explicitly on the
command line.

This is most useful if you are using --test-list to specify a
long list of files but you still want to skip some of them
depending on what's in TestExpectations.

• Scripts/webkitpy/layout_tests/controllers/layout_test_finder.py:

(LayoutTestFinder.skip_tests):

• Scripts/webkitpy/layout_tests/run_webkit_tests.py:

(parse_args):

• Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:

(MainTest.test_skipped_flag):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/controllers/layout_test_finder.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/run_webkit_tests.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-10-04  Dirk Pranke  <dpranke@chromium.org>
+
+        [NRWT] --skipped option is ignored when --test-list is used
+        https://bugs.webkit.org/show_bug.cgi?id=98260
+
+        Reviewed by Ojan Vafai.
+
+        Adds a --skipped=always flag that will skip any tests listed in
+        TestExpectations even if they're listed explicitly on the
+        command line.
+
+        This is most useful if you are using --test-list to specify a
+        long list of files but you still want to skip some of them
+        depending on what's in TestExpectations.
+
+        * Scripts/webkitpy/layout_tests/controllers/layout_test_finder.py:
+        (LayoutTestFinder.skip_tests):
+        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+        (parse_args):
+        * Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py:
+        (MainTest.test_skipped_flag):
+
 2012-10-04  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_finder.py

@@ -107 +107 @@
         elif self._options.skipped == 'ignore':
             tests_to_skip = set()
-        elif self._options.skipped == 'default':
-            pass  # listed for completeness
-
-        # make sure we're explicitly running any tests passed on the command line.
-        tests_to_skip -= paths
+        elif self._options.skipped != 'always':
+            # make sure we're explicitly running any tests passed on the command line; equivalent to 'default'.
+            tests_to_skip -= paths
 
         # unless of course we don't want to run the HTTP tests :)

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

@@ -376 +376 @@
             help="read list of tests to run from file", metavar="FILE"),
         optparse.make_option("--skipped", action="store", default="default",
-            help="control how tests marked SKIP are run. 'default' == Skip, 'ignore' == Run them anyway, 'only' == only run the SKIP tests."),
+            help=("control how tests marked SKIP are run. "
+                 "'default' == Skip tests unless explicitly listed on the command line, "
+                 "'ignore' == Run them anyway, "
+                 "'only' == only run the SKIP tests, "
+                 "'always' == always skip, even if listed on the command line.")),
         optparse.make_option("--force", dest="skipped", action="store_const", const='ignore',
             help="Run all tests, even those marked SKIP in the test list (same as --skipped=ignore)"),

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

@@ -419 +419 @@
                           ['passes/skipped/skip.html'])
 
+        # Now check that we don't run anything.
+        self.assertEquals(get_tests_run(['--skipped=always', 'passes/skipped/skip.html'], tests_included=True, flatten_batches=True),
+                          [])
+
     def test_iterations(self):
         tests_to_run = ['passes/image.html', 'passes/text.html']