Modified: trunk/Tools/ChangeLog (137516 => 137517)
--- trunk/Tools/ChangeLog 2012-12-12 22:35:44 UTC (rev 137516)
+++ trunk/Tools/ChangeLog 2012-12-12 22:40:08 UTC (rev 137517)
@@ -1,3 +1,20 @@
+2012-12-12 Dirk Pranke <dpra...@chromium.org>
+
+ nrwt: remove deprecated ORWT compatibility command line flags
+ https://bugs.webkit.org/show_bug.cgi?id=104301
+
+ Reviewed by Eric Seidel.
+
+ The command line flags for --noshow-results, --[no-]launch-safari,
+ and --use-remote-links-to-tests were for compatibility with
+ old-run-webkit-tests, but the compatibility is not needed any more
+ since NRWT is basically default and the scripts that passed the
+ old flags have been updated.
+
+ * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+ (_set_up_derived_options):
+ (parse_args):
+
2012-12-12 John Griggs <jgri...@rim.com>
2012-12-12 John Griggs <jgri...@rim.com>
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py (137516 => 137517)
--- trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2012-12-12 22:35:44 UTC (rev 137516)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2012-12-12 22:40:08 UTC (rev 137517)
@@ -166,21 +166,7 @@
options.verbose = True
-def _compat_shim_callback(option, opt_str, value, parser): # ignore unused variable warning - pylint: disable-msg=W0613
- print "Ignoring unsupported option: %s" % opt_str
-
-
-def _compat_shim_option(option_name, **kwargs):
- return optparse.make_option(option_name, action=""
- callback=_compat_shim_callback,
- help="Ignored, for old-run-webkit-tests compat only.", **kwargs)
-
-
def parse_args(args=None):
- """Provides a default set of command line args.
-
- Returns a tuple of options, args from optparse"""
-
option_group_definitions = []
option_group_definitions.append(("Platform options", platform_options()))
@@ -220,12 +206,6 @@
help="Path to a directory containing the executables needed to run tests."),
]))
- option_group_definitions.append(("ORWT Compatibility Options", [
- # FIXME: Remove this option once the bots don't refer to it.
- # results.html is smart enough to figure this out itself.
- _compat_shim_option("--use-remote-links-to-tests"),
- ]))
-
option_group_definitions.append(("Results Options", [
optparse.make_option("-p", "--pixel-tests", action=""
dest="pixel_tests", help="Enable pixel-to-pixel PNG comparisons"),
@@ -285,10 +265,6 @@
default=True, dest="show_results",
help="Don't launch a browser with results after the tests "
"are done"),
- # FIXME: We should have a helper function to do this sort of
- # deprectated mapping and automatically log, etc.
- optparse.make_option("--noshow-results", action="" dest="show_results", help="Deprecated, same as --no-show-results."),
- optparse.make_option("--no-launch-safari", action="" dest="show_results", help="Deprecated, same as --no-show-results."),
optparse.make_option("--full-results-html", action=""
default=False,
help="Show all failures in results.html, rather than only regressions"),
