reland r151588 (remove unsupported run-webkit-tests flags)

reland r151588 (remove unsupported run-webkit-tests flags)

This removes most of the flags for run-webkit-tests that were only supported
on the apple and other non-chromium ports, including --32-bit,
--gc-between-tests, --complex-tests, --leaks, --guard-malloc, --threaded,
and --root.

The change from r151588 is to keep --target and --chromium (still used by the bots).

R=ojan@chromium.org
BUG=245504
Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=151973

[ojan, 2013-06-06 00:11:58]

LGTM


On Wed, Jun 5, 2013 at 4:51 PM, <dpranke@chromium.org> wrote:

> Reviewers: ojan,
>
> Description:
> reland r151588 (remove unsupported run-webkit-tests flags)
>
> This removes most of the flags for run-webkit-tests that were only
> supported
> on the apple and other non-chromium ports, including --32-bit,
> --gc-between-tests, --complex-tests, --leaks, --guard-malloc, --threaded,
> and --root.
>
> This also removes the --chromium flag, as it was redundant (--chromium is
> now the default).
>
> The change from r151588 is to keep --target (still used by the bots).
>
> R=ojan@chromium.org
> BUG=245504
>
> Please review this at
https://codereview.chromium.**org/16511002/<https://codereview.chromium.org/1...
>
> SVN Base:
svn://svn.chromium.org/blink/**trunk<http://svn.chromium.org/blink/trunk>
>
> Affected files:
>   M Tools/Scripts/webkitpy/layout_**tests/port/base.py
>   M Tools/Scripts/webkitpy/layout_**tests/port/chromium.py
>   M Tools/Scripts/webkitpy/layout_**tests/port/driver.py
>   M Tools/Scripts/webkitpy/layout_**tests/port/factory.py
>   M Tools/Scripts/webkitpy/layout_**tests/port/port_testcase.py
>   M Tools/Scripts/webkitpy/layout_**tests/run_webkit_tests.py
>   M Tools/Scripts/webkitpy/layout_**tests/run_webkit_tests_**
> integrationtest.py
>
>
> Index: Tools/Scripts/webkitpy/layout_**tests/port/base.py
> diff --git a/Tools/Scripts/webkitpy/**layout_tests/port/base.py
> b/Tools/Scripts/webkitpy/**layout_tests/port/base.py
> index 155cdcd9ea68f352a5fd7082ab7ab1**96b129e645..**
> 8b188408ad692b6a78b04137089f8f**533d2fa5c1 100644
> --- a/Tools/Scripts/webkitpy/**layout_tests/port/base.py
> +++ b/Tools/Scripts/webkitpy/**layout_tests/port/base.py
> @@ -146,7 +146,6 @@ class Port(object):
>          self._test_configuration = None
>          self._reftest_list = {}
>          self._results_directory = None
> -        self._root_was_set = hasattr(options, 'root') and options.root
>
>      def buildbot_archives_baselines(**self):
>          return True
> @@ -237,8 +236,7 @@ class Port(object):
>      def check_build(self, needs_http):
>          """This routine is used to ensure that the build is up to date
>          and all the needed binaries are present."""
> -        # If we're using a pre-built copy of WebKit (--root), we assume
> it also includes a build of DRT.
> -        if not self._root_was_set and self.get_option('build'):
> +        if self.get_option('build'):
>              return False
>          if not self._check_driver():
>              return False
> @@ -1207,18 +1205,11 @@ class Port(object):
>          return self._filesystem.join(self.**layout_tests_dir(), 'http',
> 'conf', config_file_name)
>
>      def _build_path(self, *comps):
> -        root_directory = self.get_option('root')
> -        if not root_directory:
> -            build_directory = self.get_option('build_**directory')
> -            if build_directory:
> -                root_directory = self._filesystem.join(build_**directory,
> self.get_option('**configuration'))
> -            else:
> -                root_directory = self._config.build_directory(**
> self.get_option('**configuration'))
> -            # Set --root so that we can pass this to subprocesses and
> avoid making the
> -            # slow call to config.build_directory() N times in each
> worker.
> -            # FIXME: This is like @memoized, but more annoying and
> fragile; there should be another
> -            # way to propagate values without mutating the options list.
> -            self.set_option_default('root'**, root_directory)
> +        build_directory = self.get_option('build_**directory')
> +        if build_directory:
> +            root_directory = self._filesystem.join(build_**directory,
> self.get_option('**configuration'))
> +        else:
> +            root_directory = self._config.build_directory(**
> self.get_option('**configuration'))
>          return
self._filesystem.join(self._**filesystem.abspath(root_**directory),
> *comps)
>
>      def _path_to_driver(self, configuration=None):
> Index: Tools/Scripts/webkitpy/layout_**tests/port/chromium.py
> diff --git a/Tools/Scripts/webkitpy/**layout_tests/port/chromium.py
> b/Tools/Scripts/webkitpy/**layout_tests/port/chromium.py
> index d7a90851ef05c32af58d9c31c08b9a**0dacb5f755..**
> 3b6eed2b34774d20d31997e97eda2b**c97d0aed63 100644
> --- a/Tools/Scripts/webkitpy/**layout_tests/port/chromium.py
> +++ b/Tools/Scripts/webkitpy/**layout_tests/port/chromium.py
> @@ -440,7 +440,7 @@ class ChromiumPort(Port):
>          return self._build_path_with_**configuration(None, *comps)
>
>      def _build_path_with_**configuration(self, configuration, *comps):
> -        # Note that we don't implement --root or do the option caching
> that the
> +        # Note that we don't do the option caching that the
>          # base class does, because finding the right directory is
> relatively
>          # fast.
>          configuration = configuration or self.get_option('**
> configuration')
> Index: Tools/Scripts/webkitpy/layout_**tests/port/driver.py
> diff --git a/Tools/Scripts/webkitpy/**layout_tests/port/driver.py
> b/Tools/Scripts/webkitpy/**layout_tests/port/driver.py
> index 4fa44882c8ffdcf87c5f00974f1e12**d9ccd2dd6a..**
> 6fe5c39ee9fd7a02a97ba9bf566819**3d56b862b5 100644
> --- a/Tools/Scripts/webkitpy/**layout_tests/port/driver.py
> +++ b/Tools/Scripts/webkitpy/**layout_tests/port/driver.py
> @@ -332,12 +332,6 @@ class Driver(object):
>      def cmd_line(self, pixel_tests, per_test_args):
>          cmd = self._command_wrapper(self._**port.get_option('wrapper'))
>          cmd.append(self._port._path_**to_driver())
> -        if self._port.get_option('gc_**between_tests'):
> -            cmd.append('--gc-between-**tests')
> -        if self._port.get_option('**complex_text'):
> -            cmd.append('--complex-text')
> -        if self._port.get_option('**threaded'):
> -            cmd.append('--threaded')
>          if self._no_timeout:
>              cmd.append('--no-timeout')
>          # FIXME: We need to pass --timeout=SECONDS to WebKitTestRunner
> for WebKit2.
> Index: Tools/Scripts/webkitpy/layout_**tests/port/factory.py
> diff --git a/Tools/Scripts/webkitpy/**layout_tests/port/factory.py
> b/Tools/Scripts/webkitpy/**layout_tests/port/factory.py
> index e83cdd3b817186901a144655806c99**5ae5ee4769..**
> cf344b5540f2ab2e5da4fd4af86b7a**764bad6e84 100644
> --- a/Tools/Scripts/webkitpy/**layout_tests/port/factory.py
> +++ b/Tools/Scripts/webkitpy/**layout_tests/port/factory.py
> @@ -39,9 +39,6 @@ def platform_options(use_globs=**False):
>      return [
>          optparse.make_option('--**platform', action='store',
>              help=('Glob-style list of platform/ports to use (e.g.,
> "mac*")' if use_globs else 'Platform to use (e.g., "mac-lion")')),
> -        optparse.make_option('--**chromium', action='store_const',
> dest='platform',
> -            const=('chromium*' if use_globs else 'chromium'),
> -            help=('Alias for --platform=chromium*' if use_globs else
> 'Alias for --platform=chromium')),
>          optparse.make_option('--**chromium-android',
> action='store_const', dest='platform',
>              const=('chromium-android*' if use_globs else
> 'chromium-android'),
>              help=('Alias for --platform=chromium-android*' if use_globs
> else 'Alias for --platform=chromium')),
> @@ -50,14 +47,12 @@ def platform_options(use_globs=**False):
>
>  def configuration_options():
>      return [
> -        optparse.make_option("-t", "--target", dest="configuration",
> help="(DEPRECATED)"),
> -        # FIXME: --help should display which configuration is default.
> +        optparse.make_option("-t", "--target", dest="configuration",
> +                             help="specify the target configuration to
> use (Debug/Release)"),
>          optparse.make_option('--debug'**, action='store_const',
> const='Debug', dest="configuration",
>              help='Set the configuration to Debug'),
>          optparse.make_option('--**release', action='store_const',
> const='Release', dest="configuration",
>              help='Set the configuration to Release'),
> -        optparse.make_option('--32-**bit', action='store_const',
> const='x86', default=None, dest="architecture",
> -            help='use 32-bit binaries by default (x86 instead of
> x86_64)'),
>          ]
>
>
> Index: Tools/Scripts/webkitpy/layout_**tests/port/port_testcase.py
> diff --git a/Tools/Scripts/webkitpy/**layout_tests/port/port_**testcase.py
> b/Tools/Scripts/webkitpy/**layout_tests/port/port_**testcase.py
> index 52d3e647d3642cdd41159dcb55cadb**c7556c213c..**
> 24ff966b6615875c1fd24b67566343**847bbfa638 100644
> --- a/Tools/Scripts/webkitpy/**layout_tests/port/port_**testcase.py
> +++ b/Tools/Scripts/webkitpy/**layout_tests/port/port_**testcase.py
> @@ -472,11 +472,6 @@ class PortTestCase(unittest.**TestCase):
>                                options=MockOptions(**
> additional_platform_directory=**["internal-testwebkitport"]))
>          self.assertEqual(platform_**dirs(port), ['LayoutTests',
> 'testwebkitport', 'testwebkitport-version', 'internal-testwebkitport'])
>
> -    def test_root_option(self):
> -        port = TestWebKitPort()
> -        port._options = MockOptions(root='/foo')
> -        self.assertEqual(port._path_**to_driver(), "/foo/content_shell")
> -
>      def test_test_expectations(self):
>          # Check that we read the expectations file
>          host = MockSystemHost()
> 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 86fc2f6c784c4b71ac0f7dc4f52e0e**1a24e2d6e0..**
> d10a4e6394229995eed7cca751f206**1af3f39bbc 100644
> --- a/Tools/Scripts/webkitpy/**layout_tests/run_webkit_tests.**py
> +++ b/Tools/Scripts/webkitpy/**layout_tests/run_webkit_tests.**py
> @@ -109,22 +109,6 @@ def parse_args(args):
>              help="Run Android layout tests on these devices."),
>      ]))
>
> -    option_group_definitions.**append(("WebKit Options", [
> -        optparse.make_option("--gc-**between-tests",
> action="store_true", default=False,
> -            help="Force garbage collection between each test"),
> -        optparse.make_option("--**complex-text", action="store_true",
> default=False,
> -            help="Use the complex text code path for all text (Mac OS X
> and Windows only)"),
> -        optparse.make_option("-l", "--leaks", action="store_true",
> default=False,
> -            help="Enable leaks checking (Mac OS X only)"),
> -        optparse.make_option("-g", "--guard-malloc", action="store_true",
> default=False,
> -            help="Enable Guard Malloc (Mac OS X only)"),
> -        optparse.make_option("--**threaded", action="store_true",
> default=False,
> -            help="Run a concurrent JavaScript thread with each test"),
> -        # FIXME: We should merge this w/ --build-directory and only have
> one flag.
> -        optparse.make_option("--root", action="store",
> -            help="Path to a directory containing the executables needed
> to run tests."),
> -    ]))
> -
>      option_group_definitions.**append(("Results Options", [
>          optparse.make_option("-p", "--pixel", "--pixel-tests",
> action="store_true",
>              dest="pixel_tests", help="Enable pixel-to-pixel PNG
> comparisons"),
> Index: Tools/Scripts/webkitpy/layout_**tests/run_webkit_tests_**
> integrationtest.py
> diff --git
a/Tools/Scripts/webkitpy/**layout_tests/run_webkit_tests_**integrationtest.py
> b/Tools/Scripts/webkitpy/**layout_tests/run_webkit_tests_**
> integrationtest.py
> index 637824046882bd59e866eaac55714b**97bb81f2e6..**
> 8d48effec9ca8bc3854059bf59bebb**39efa39f5e 100644
> --- a/Tools/Scripts/webkitpy/**layout_tests/run_webkit_tests_**
> integrationtest.py
> +++ b/Tools/Scripts/webkitpy/**layout_tests/run_webkit_tests_**
> integrationtest.py
> @@ -346,15 +346,6 @@ class RunTest(unittest.TestCase, StreamTestingMixin):
>          tests_run = get_tests_run(['--order=none'] + tests_to_run)
>          self.assertEqual(tests_run, ['http/tests/ssl/text.html',
> 'perf/foo/test.html', 'http/tests/passes/image.html'**,
> 'http/tests/passes/text.html']**)
>
> -    def test_gc_between_tests(self):
> -        self.assertTrue(passing_run(['**--gc-between-tests']))
> -
> -    def test_complex_text(self):
> -        self.assertTrue(passing_run(['**--complex-text']))
> -
> -    def test_threaded(self):
> -        self.assertTrue(passing_run(['**--threaded']))
> -
>      def test_repeat_each(self):
>          tests_to_run = ['passes/image.html', 'passes/text.html']
>          tests_run = get_tests_run(['--repeat-each'**, '2'] +
> tests_to_run)
>
>
>

[Dirk Pranke, 2013-06-06 22:44:39]

Committed patchset #3 manually as r151973 (presubmit successful).