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

Tools/Scripts/webkitpy/layout_tests/port/base.py

 # Copyright (C) 2010 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 128 matching lines @@
 
         # FIXME: prettypatch.py knows this path, why is it copied here?
         self._pretty_patch_path = self.path_from_webkit_base("Tools", "Scripts", "webkitruby", "PrettyPatch", "prettify.rb")
         self._pretty_patch_available = None
 
         if not hasattr(options, 'configuration') or not options.configuration:
             self.set_option_default('configuration', self.default_configuration())
         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
 
     def additional_drt_flag(self):
         if self.driver_name() == self.CONTENT_SHELL_NAME:
             return ['--dump-render-tree']
         return []
 
     def supports_per_test_timeout(self):
@@ skipping 70 matching lines @@
     def _compare_baseline(self):
         factory = PortFactory(self.host)
         target_port = self.get_option('compare_port')
         if target_port:
             return factory.get(target_port).default_baseline_search_path()
         return []
 
     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
         if self.get_option('pixel_tests'):
             if not self.check_image_diff():
                 return False
         if not self._check_port_build():
             return False
         return True
 
@@ skipping 948 matching lines @@
         config_file_from_env = os.environ.get('WEBKIT_HTTP_SERVER_CONF_PATH')
         if config_file_from_env:
             if not self._filesystem.exists(config_file_from_env):
                 raise IOError('%s was not found on the system' % config_file_from_env)
             return config_file_from_env
 
         config_file_name = self._apache_config_file_name_for_platform(sys.platform)
         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):
         """Returns the full path to the test driver (DumpRenderTree)."""
         return self._build_path(self.driver_name())
 
     def _path_to_webcore_library(self):
         """Returns the full path to a built copy of WebCore."""
         return None
 
@@ skipping 171 matching lines @@
 
 class VirtualTestSuite(object):
     def __init__(self, name, base, args, tests=None):
         self.name = name
         self.base = base
         self.args = args
         self.tests = tests or set()
 
     def __repr__(self):
         return "VirtualTestSuite('%s', '%s', %s)" % (self.name, self.base, self.args)