Changeset 77341 in webkit
- Timestamp:
- Feb 1, 2011 5:16:29 PM (13 years ago)
- Location:
- trunk/Tools
- Files:
-
- 1 added
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r77279 r77341 1 2011-02-01 Dirk Pranke <dpranke@chromium.org> 2 3 Reviewed by Tony Chang. 4 5 new-run-webkit-tests: add first stub of test_runner2. This 6 will add support for the 'inline', 'threads', and 'processes' 7 flags to --worker-model, but for now the implementatios just 8 fall back on the old ones. 9 10 https://bugs.webkit.org/show_bug.cgi?id=53157 11 12 * Scripts/webkitpy/layout_tests/layout_package/test_runner2.py: 13 * Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py: 14 1 15 2011-02-01 Mihai Parparita <mihaip@chromium.org> 2 16 -
trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py
r77163 r77341 40 40 from layout_package import printing 41 41 from layout_package import test_runner 42 from layout_package import test_runner2 42 43 43 44 from webkitpy.common.system import user … … 88 89 num_unexpected_results = -1 89 90 try: 90 runner = test_runner.TestRunner(port, options, printer) 91 if options.worker_model in ('inline', 'threads', 'processes'): 92 runner = test_runner2.TestRunner2(port, options, printer) 93 else: 94 runner = test_runner.TestRunner(port, options, printer) 95 91 96 runner._print_config() 92 97 … … 130 135 options.worker_model = port_obj.default_worker_model() 131 136 132 if options.worker_model == 'old-inline':137 if options.worker_model in ('inline', 'old-inline'): 133 138 if options.child_processes and int(options.child_processes) > 1: 134 warnings.append("--worker-model= old-inline overrides --child-processes")139 warnings.append("--worker-model=%s overrides --child-processes" % options.worker_model) 135 140 options.child_processes = "1" 136 141 if not options.child_processes: … … 370 375 # FIXME: Display default number of child processes that will run. 371 376 optparse.make_option("--worker-model", action="store", 372 default=None, help=("controls worker model. Valid values "373 " are 'old-inline', 'old-threads'.")),377 default=None, help=("controls worker model. Valid values are 'old-inline', " 378 "'old-threads', 'inline', 'threads', and 'processes'.")), 374 379 optparse.make_option("--experimental-fully-parallel", 375 380 action="store_true", default=False, -
trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py
r76642 r77341 453 453 454 454 def test_worker_model__inline(self): 455 self.assertTrue(passing_run(['--worker-model', 'inline'])) 456 457 def test_worker_model__old_inline_with_child_processes(self): 458 res, out, err, user = logging_run(['--worker-model', 'old-inline', 459 '--child-processes', '2']) 460 self.assertEqual(res, 0) 461 self.assertTrue('--worker-model=old-inline overrides --child-processes\n' in err.get()) 462 463 def test_worker_model__old_inline(self): 455 464 self.assertTrue(passing_run(['--worker-model', 'old-inline'])) 456 465 466 def test_worker_model__old_threads(self): 467 self.assertTrue(passing_run(['--worker-model', 'old-threads'])) 468 469 def test_worker_model__processes(self): 470 self.assertRaises(ValueError, logging_run, ['--worker-model', 'processes']) 471 457 472 def test_worker_model__threads(self): 458 self.assertTrue(passing_run(['--worker-model', ' old-threads']))473 self.assertTrue(passing_run(['--worker-model', 'threads'])) 459 474 460 475 def test_worker_model__unknown(self):
Note: See TracChangeset
for help on using the changeset viewer.