Bug 1251037 - Fix ./mach marionette command line to work with options and tests. r=automatedtester, r=gps
authorSyd Polk <spolk@mozilla.com>
Mon, 29 Feb 2016 11:39:28 -0600
changeset 286128 0cf25ffb904e8505039e722ca88ac08d24594698
parent 286121 2a613f5a58663485f3c20b18a9fc867a09bc532a
child 286129 9b6e06d5dab6be01b5a8645a568787f62748931b
push id30039
push usercbook@mozilla.com
push dateTue, 01 Mar 2016 11:02:11 +0000
treeherdermozilla-central@5cafa6f3019b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersautomatedtester, gps
bugs1251037
milestone47.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 1251037 - Fix ./mach marionette command line to work with options and tests. r=automatedtester, r=gps
testing/marionette/mach_commands.py
--- a/testing/marionette/mach_commands.py
+++ b/testing/marionette/mach_commands.py
@@ -39,22 +39,22 @@ def run_marionette(tests, b2g_path=None,
     from marionette.runtests import (
         MarionetteTestRunner,
         BaseMarionetteArguments,
         MarionetteHarness
     )
 
     parser = BaseMarionetteArguments()
     commandline.add_logging_group(parser)
-    args = parser.parse_args()
 
     if not tests:
         tests = [os.path.join(topsrcdir,
                  'testing/marionette/harness/marionette/tests/unit-tests.ini')]
-    args.tests = tests
+
+    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)