Removed shell option from testrunner.

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

tools/testrunner/base_runner.py

@@ -199,8 +199,6 @@ class BaseTestRunner(object):
     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", help="DEPRECATED! use --shell-dir",
-                      default="")
     parser.add_option("--shell-dir", help="Directory containing executables",
                       default="")
 
@@ -327,16 +325,9 @@ class BaseTestRunner(object):
   def _set_shell_dir(self, options):
     self.shell_dir = options.shell_dir
     if not self.shell_dir:
-      # TODO(majeski): drop this option
-      if options.shell:
-        print "Warning: --shell is deprecated, use --shell-dir instead."
-        self.shell_dir = os.path.dirname(options.shell)
-      else:
-        # If an output dir with a build was passed, test directly in that
-        # directory.
-        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)
+      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