Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(126)

Side by Side Diff: Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py

Issue 17385018: Remove the --no-http option to run-webkit-tests. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright (C) 2010 Google Inc. All rights reserved. 1 # Copyright (C) 2010 Google Inc. All rights reserved.
2 # Copyright (C) 2010 Gabor Rapcsanyi (rgabor@inf.u-szeged.hu), University of Sze ged 2 # Copyright (C) 2010 Gabor Rapcsanyi (rgabor@inf.u-szeged.hu), University of Sze ged
3 # Copyright (C) 2011 Apple Inc. All rights reserved. 3 # Copyright (C) 2011 Apple Inc. All rights reserved.
4 # 4 #
5 # Redistribution and use in source and binary forms, with or without 5 # Redistribution and use in source and binary forms, with or without
6 # modification, are permitted provided that the following conditions are 6 # modification, are permitted provided that the following conditions are
7 # met: 7 # met:
8 # 8 #
9 # * Redistributions of source code must retain the above copyright 9 # * Redistributions of source code must retain the above copyright
10 # notice, this list of conditions and the following disclaimer. 10 # notice, this list of conditions and the following disclaimer.
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 help="Use the specified port's baselines first"), 170 help="Use the specified port's baselines first"),
171 optparse.make_option("--no-show-results", action="store_false", 171 optparse.make_option("--no-show-results", action="store_false",
172 default=True, dest="show_results", 172 default=True, dest="show_results",
173 help="Don't launch a browser with results after the tests " 173 help="Don't launch a browser with results after the tests "
174 "are done"), 174 "are done"),
175 optparse.make_option("--full-results-html", action="store_true", 175 optparse.make_option("--full-results-html", action="store_true",
176 default=False, 176 default=False,
177 help="Show all failures in results.html, rather than only regression s"), 177 help="Show all failures in results.html, rather than only regression s"),
178 optparse.make_option("--clobber-old-results", action="store_true", 178 optparse.make_option("--clobber-old-results", action="store_true",
179 default=False, help="Clobbers test results from previous runs."), 179 default=False, help="Clobbers test results from previous runs."),
180 optparse.make_option("--http", action="store_true", dest="http",
181 default=True, help="Run HTTP and WebSocket tests (default)"),
182 optparse.make_option("--no-http", action="store_false", dest="http",
183 help="Don't run HTTP and WebSocket tests"),
184 optparse.make_option("--ignore-metrics", action="store_true", dest="igno re_metrics", 180 optparse.make_option("--ignore-metrics", action="store_true", dest="igno re_metrics",
185 default=False, help="Ignore rendering metrics related information fr om test " 181 default=False, help="Ignore rendering metrics related information fr om test "
186 "output, only compare the structure of the rendertree."), 182 "output, only compare the structure of the rendertree."),
187 ])) 183 ]))
188 184
189 option_group_definitions.append(("Testing Options", [ 185 option_group_definitions.append(("Testing Options", [
190 optparse.make_option("--build", dest="build", 186 optparse.make_option("--build", dest="build",
191 action="store_true", default=True, 187 action="store_true", default=True,
192 help="Check to ensure the DumpRenderTree build is up-to-date " 188 help="Check to ensure the DumpRenderTree build is up-to-date "
193 "(default)."), 189 "(default)."),
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 options.time_out_ms = str(port.default_timeout_ms()) 312 options.time_out_ms = str(port.default_timeout_ms())
317 313
318 options.slow_time_out_ms = str(5 * int(options.time_out_ms)) 314 options.slow_time_out_ms = str(5 * int(options.time_out_ms))
319 315
320 if options.additional_platform_directory: 316 if options.additional_platform_directory:
321 additional_platform_directories = [] 317 additional_platform_directories = []
322 for path in options.additional_platform_directory: 318 for path in options.additional_platform_directory:
323 additional_platform_directories.append(port.host.filesystem.abspath( path)) 319 additional_platform_directories.append(port.host.filesystem.abspath( path))
324 options.additional_platform_directory = additional_platform_directories 320 options.additional_platform_directory = additional_platform_directories
325 321
326 if not options.http and options.skipped in ('ignore', 'only'):
327 _log.warning("--force/--skipped=%s overrides --no-http." % (options.skip ped))
328 options.http = True
329
330 if options.ignore_metrics and (options.new_baseline or options.reset_results ): 322 if options.ignore_metrics and (options.new_baseline or options.reset_results ):
331 _log.warning("--ignore-metrics has no effect with --new-baselines or wit h --reset-results") 323 _log.warning("--ignore-metrics has no effect with --new-baselines or wit h --reset-results")
332 324
333 if options.new_baseline: 325 if options.new_baseline:
334 options.reset_results = True 326 options.reset_results = True
335 options.add_platform_exceptions = True 327 options.add_platform_exceptions = True
336 328
337 if options.pixel_test_directories: 329 if options.pixel_test_directories:
338 options.pixel_tests = True 330 options.pixel_tests = True
339 varified_dirs = set() 331 varified_dirs = set()
(...skipping 26 matching lines...) Expand all
366 printer.print_config(port.results_directory()) 358 printer.print_config(port.results_directory())
367 359
368 run_details = manager.run(args) 360 run_details = manager.run(args)
369 _log.debug("Testing completed, Exit status: %d" % run_details.exit_code) 361 _log.debug("Testing completed, Exit status: %d" % run_details.exit_code)
370 return run_details 362 return run_details
371 finally: 363 finally:
372 printer.cleanup() 364 printer.cleanup()
373 365
374 if __name__ == '__main__': 366 if __name__ == '__main__':
375 sys.exit(main(sys.argv[1:], sys.stdout, sys.stderr)) 367 sys.exit(main(sys.argv[1:], sys.stdout, sys.stderr))
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698