Changeset 137517 in webkit

Timestamp:

Dec 12, 2012, 2:40:08 PM (12 years ago)

Author:

dpranke@chromium.org

Message:

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):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/run_webkit_tests.py (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-12-12  Dirk Pranke  <dpranke@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  <jgriggs@rim.com>
 

trunk/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py

@@ -167 +167 @@
 
 
-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",
-        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 = []
 
@@ -219 +205 @@
         optparse.make_option("--root", action="store",
             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"),
     ]))
 
@@ -286 +266 @@
             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="store_false", dest="show_results", help="Deprecated, same as --no-show-results."),
-        optparse.make_option("--no-launch-safari", action="store_false", dest="show_results", help="Deprecated, same as --no-show-results."),
         optparse.make_option("--full-results-html", action="store_true",
             default=False,