Title: [130381] trunk/Tools
- Revision
- 130381
- Author
- [email protected]
- Date
- 2012-10-04 03:18:54 -0700 (Thu, 04 Oct 2012)
Log 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):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (130380 => 130381)
--- trunk/Tools/ChangeLog 2012-10-04 10:08:00 UTC (rev 130380)
+++ trunk/Tools/ChangeLog 2012-10-04 10:18:54 UTC (rev 130381)
@@ -1,3 +1,25 @@
+2012-10-04 Dirk Pranke <[email protected]>
+
+ [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 <[email protected]>
Unreviewed, rolling out r130377.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_finder.py (130380 => 130381)
--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_finder.py 2012-10-04 10:08:00 UTC (rev 130380)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/layout_test_finder.py 2012-10-04 10:18:54 UTC (rev 130381)
@@ -106,12 +106,10 @@
tests_to_skip = all_tests - tests_to_skip
elif self._options.skipped == 'ignore':
tests_to_skip = set()
- elif self._options.skipped == 'default':
- pass # listed for completeness
+ 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
- # make sure we're explicitly running any tests passed on the command line.
- tests_to_skip -= paths
-
# unless of course we don't want to run the HTTP tests :)
if not self._options.http:
tests_to_skip.update(set(http_tests))
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py (130380 => 130381)
--- trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2012-10-04 10:08:00 UTC (rev 130380)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2012-10-04 10:18:54 UTC (rev 130381)
@@ -375,7 +375,11 @@
optparse.make_option("--test-list", action=""
help="read list of tests to run from file", metavar="FILE"),
optparse.make_option("--skipped", action="" 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="" const='ignore',
help="Run all tests, even those marked SKIP in the test list (same as --skipped=ignore)"),
optparse.make_option("--time-out-ms",
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py (130380 => 130381)
--- trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py 2012-10-04 10:08:00 UTC (rev 130380)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py 2012-10-04 10:18:54 UTC (rev 130381)
@@ -418,6 +418,10 @@
self.assertEquals(get_tests_run(['--skipped=only', 'passes'], tests_included=True, flatten_batches=True),
['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']
tests_run = get_tests_run(['--iterations', '2'] + tests_to_run, tests_included=True, flatten_batches=True)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
