Bug 1274408: Remove emulator mach support for Marionette r=jgriffin
authorDavid Burns <dburns@mozilla.com>
Thu, 19 May 2016 22:38:38 +0100
changeset 337923 78bf598eed77833dcac06dad82c167c03c2038a6
parent 337922 5b70e44e565f0cb8fcc0e03dba4e38bd070f97fc
child 337924 5ca92d57dac6428ad0bcd34635d3db34d43e8fd2
push id6249
push userjlund@mozilla.com
push dateMon, 01 Aug 2016 13:59:36 +0000
treeherdermozilla-beta@bad9d4f5bf7e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjgriffin
bugs1274408
milestone49.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1274408: Remove emulator mach support for Marionette r=jgriffin Since we are not supporting the B2G Emulator, we should remove this dead code. MozReview-Commit-ID: 4PY95y3q9BO
testing/marionette/mach_commands.py
--- a/testing/marionette/mach_commands.py
+++ b/testing/marionette/mach_commands.py
@@ -14,31 +14,22 @@ from mozbuild.base import (
 )
 
 from mach.decorators import (
     CommandArgument,
     CommandProvider,
     Command,
 )
 
-MARIONETTE_DISABLED_B2G = '''
-The %s command requires a Marionette-enabled build.
-
-Please create an engineering build, which has Marionette enabled.  You can do
-this by ommitting the VARIANT variable when building, or using:
-
-VARIANT=eng ./build.sh
-'''
 
 def setup_argument_parser():
     from marionette.runner.base import BaseMarionetteArguments
     return BaseMarionetteArguments()
 
-def run_marionette(tests, b2g_path=None, emulator=None,
-    address=None, binary=None, topsrcdir=None, **kwargs):
+def run_marionette(tests, testtype=None, address=None, binary=None, topsrcdir=None, **kwargs):
     from mozlog.structured import commandline
 
     from marionette.runtests import (
         MarionetteTestRunner,
         BaseMarionetteArguments,
         MarionetteHarness
     )
 
@@ -46,23 +37,18 @@ def run_marionette(tests, b2g_path=None,
     commandline.add_logging_group(parser)
 
     if not tests:
         tests = [os.path.join(topsrcdir,
                  'testing/marionette/harness/marionette/tests/unit-tests.ini')]
 
     args = parser.parse_args(args=tests)
 
-    if b2g_path:
-        args.homedir = b2g_path
-        if emulator:
-            args.emulator = emulator
-    else:
-        args.binary = binary
-        path, exe = os.path.split(args.binary)
+    args.binary = binary
+    path, exe = os.path.split(args.binary)
 
     for k, v in kwargs.iteritems():
         setattr(args, k, v)
 
     parser.verify_usage(args)
 
     args.logger = commandline.setup_logging("Marionette Unit Tests",
                                             args,