Changeset 158373 in webkit
- Timestamp:
- Oct 31, 2013 11:13:10 AM (10 years ago)
- Location:
- trunk/Tools
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r158371 r158373 1 2013-10-31 Tamas Gergely <gertom@inf.u-szeged.hu> 2 3 Run tests as if they are expected to pass when --force is given. 4 https://bugs.webkit.org/show_bug.cgi?id=112890 5 6 Reviewed by Ryosuke Niwa. 7 8 The --force switch of new-run-webkit-tests is now forces all tests to 9 be run with 'PASS' as expected result. 10 11 * Scripts/webkitpy/layout_tests/controllers/manager.py: 12 (Manager.run): 13 * Scripts/webkitpy/layout_tests/models/test_expectations.py: 14 (TestExpectations.__init__): 15 (TestExpectations._add_expectations): 16 * Scripts/webkitpy/layout_tests/run_webkit_tests.py: 17 (parse_args): 18 (_set_up_derived_options): 19 1 20 2013-10-31 Geoffrey Garen <ggaren@apple.com> 2 21 -
trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py
r157804 r158373 180 180 181 181 self._printer.write_update("Parsing expectations ...") 182 self._expectations = test_expectations.TestExpectations(self._port, test_names )182 self._expectations = test_expectations.TestExpectations(self._port, test_names, force_expectations_pass=self._options.force) 183 183 184 184 tests_to_run, tests_to_skip = self._prepare_lists(paths, test_names) -
trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py
r157831 r158373 834 834 # the expectations into separate routines so that linting and handling overrides 835 835 # can be controlled separately, and the constructor can be more of a no-op. 836 def __init__(self, port, tests=None, include_generic=True, include_overrides=True, expectations_to_lint=None ):836 def __init__(self, port, tests=None, include_generic=True, include_overrides=True, expectations_to_lint=None, force_expectations_pass=False): 837 837 self._full_test_list = tests 838 838 self._test_config = port.test_configuration() … … 843 843 self._skipped_tests_warnings = [] 844 844 self._expectations = [] 845 self._force_expectations_pass = force_expectations_pass 845 846 846 847 expectations_dict = expectations_to_lint or port.expectations_dict() … … 991 992 def _add_expectations(self, expectation_list): 992 993 for expectation_line in expectation_list: 993 if not expectation_line.expectations: 994 if self._force_expectations_pass: 995 expectation_line.expectations = ['PASS'] 996 expectation_line.parsed_expectations = set([PASS]) 997 998 elif not expectation_line.expectations: 994 999 continue 995 1000 -
trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
r157815 r158373 227 227 "'only' == only run the SKIP tests, " 228 228 "'always' == always skip, even if listed on the command line.")), 229 optparse.make_option("--force", dest="skipped", action="store_const", const='ignore',230 help="Run all tests , even those marked SKIP in the test list (same as --skipped=ignore)"),229 optparse.make_option("--force", action="store_true", default=False, 230 help="Run all tests with PASS as expected result, even those marked SKIP in the test list (implies --skipped=ignore)"), 231 231 optparse.make_option("--time-out-ms", 232 232 help="Set the timeout for each test"), … … 338 338 options.additional_platform_directory = additional_platform_directories 339 339 340 if options.force: 341 if options.skipped not in ('ignore', 'default'): 342 _log.warning("--force overrides --skipped=%s" % (options.skipped)) 343 options.skipped = 'ignore' 344 340 345 if not options.http and options.skipped in ('ignore', 'only'): 341 346 _log.warning("--force/--skipped=%s overrides --no-http." % (options.skipped))
Note: See TracChangeset
for help on using the changeset viewer.