Deprecated shell dir option.

Bug: v8:6917
Change-Id: Ia80de1d0430efb0c5f41a79267ba9146c5be42ce
Reviewed-on: https://chromium-review.googlesource.com/751462
Commit-Queue: Michał Majewski <majeski@google.com>
Reviewed-by: Michael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/master@{#49089}

tools/testrunner/base_runner.py

@@ -153,7 +153,6 @@ class BuildConfig(object):
 class BaseTestRunner(object):
   def __init__(self):
     self.outdir = None
-    self.shell_dir = None
     self.build_config = None
     self.mode_name = None
     self.mode_options = None
@@ -195,12 +194,12 @@ class BaseTestRunner(object):
                       help="Adapt to path structure used on buildbots",
                       default=False, action="store_true")
     parser.add_option("--arch",
-                      help="The architecture to run tests for: %s")
+                      help="The architecture to run tests for")
     parser.add_option("-m", "--mode",
                       help="The test mode in which to run (uppercase for ninja"
                       " and buildbot builds): %s" % MODES.keys())
-    parser.add_option("--shell-dir", help="Directory containing executables",
-                      default="")
+    parser.add_option("--shell-dir", help="DEPRECATED! Executables from build "
+                      "directory will be used")
 
   def _add_parser_options(self, parser):
     pass
@@ -311,7 +310,9 @@ class BaseTestRunner(object):
         options.arch, self.build_config.arch))
       raise TestRunnerError()
 
-    self._set_shell_dir(options)
+    if options.shell_dir:
+      print('Warning: --shell-dir is deprecated. Searching for executables in '
+            'build directory (%s) instead.' % self.outdir)
 
   def _buildbot_to_v8_mode(self, config):
     """Convert buildbot build configs to configs understood by the v8 runner.
@@ -322,13 +323,6 @@ class BaseTestRunner(object):
     mode = config[:-4] if config.endswith('_x64') else config
     return mode.lower()
 
-  def _set_shell_dir(self, options):
-    self.shell_dir = options.shell_dir
-    if not self.shell_dir:
-      self.shell_dir = os.path.join(BASE_DIR, self.outdir)
-    if not os.path.exists(self.shell_dir):
-        raise Exception('Could not find shell_dir: "%s"' % self.shell_dir)
-
   def _process_options(self, options):
     pass
 

tools/testrunner/deopt_fuzzer.py

@@ -253,7 +253,7 @@ class DeoptFuzzer(base_runner.BaseTestRunner):
     timeout *= self.mode_options.timeout_scalefactor
     ctx = context.Context(self.build_config.arch,
                           self.mode_options.execution_mode,
-                          self.shell_dir,
+                          self.outdir,
                           self.mode_options.flags, options.verbose,
                           timeout, options.isolates,
                           options.command_prefix,

tools/testrunner/standard_runner.py

@@ -373,7 +373,7 @@ class StandardTestRunner(base_runner.BaseTestRunner):
 
       ctx = context.Context(self.build_config.arch,
                             self.mode_options.execution_mode,
-                            self.shell_dir,
+                            self.outdir,
                             self.mode_options.flags,
                             options.verbose,
                             options.timeout,