Index: Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py |
diff --git a/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py b/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py |
index 00f6d26ab5a00224f0ca5a3ab0ba2be2d54f892f..6dd2c01a2d682fb2125114758a11b00b4873a340 100644 |
--- a/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py |
+++ b/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py |
@@ -177,10 +177,6 @@ def parse_args(args): |
help="Show all failures in results.html, rather than only regressions"), |
optparse.make_option("--clobber-old-results", action="store_true", |
default=False, help="Clobbers test results from previous runs."), |
- optparse.make_option("--http", action="store_true", dest="http", |
- default=True, help="Run HTTP and WebSocket tests (default)"), |
- optparse.make_option("--no-http", action="store_false", dest="http", |
- help="Don't run HTTP and WebSocket tests"), |
optparse.make_option("--ignore-metrics", action="store_true", dest="ignore_metrics", |
default=False, help="Ignore rendering metrics related information from test " |
"output, only compare the structure of the rendertree."), |
@@ -323,10 +319,6 @@ def _set_up_derived_options(port, options): |
additional_platform_directories.append(port.host.filesystem.abspath(path)) |
options.additional_platform_directory = additional_platform_directories |
- if not options.http and options.skipped in ('ignore', 'only'): |
- _log.warning("--force/--skipped=%s overrides --no-http." % (options.skipped)) |
- options.http = True |
- |
if options.ignore_metrics and (options.new_baseline or options.reset_results): |
_log.warning("--ignore-metrics has no effect with --new-baselines or with --reset-results") |