Bug 1535026 - [marionette] 'mach marionette-test' should force e10s disabled for Fennec. r=ato
authorHenrik Skupin <mail@hskupin.info>
Thu, 14 Mar 2019 10:29:47 +0000
changeset 521865 0607c72b4d88
parent 521864 4905cca9fa81
child 521866 30b70cd83063
push id10870
push usernbeleuzu@mozilla.com
push dateFri, 15 Mar 2019 20:00:07 +0000
treeherdermozilla-beta@c594aee5b7a4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersato
bugs1535026
milestone67.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 1535026 - [marionette] 'mach marionette-test' should force e10s disabled for Fennec. r=ato Differential Revision: https://phabricator.services.mozilla.com/D23401
testing/marionette/doc/Testing.md
testing/marionette/mach_commands.py
--- a/testing/marionette/doc/Testing.md
+++ b/testing/marionette/doc/Testing.md
@@ -97,28 +97,28 @@ starting Fennec and an emulator, as show
     --avd=mozemulator-x86
 
 For Fennec tests, if the appropriate `emulator` command is in your `PATH`, you may omit the `--emulator-binary` argument.  See `./mach marionette-test -h`
 for additional options.
 
 Alternately, you can start an emulator yourself and have the Marionette runner
 start Fennec for you:
 
-    % ./mach marionette-test --emulator --app='fennec' --address=127.0.0.1:2828 --disable-e10s
+    % ./mach marionette-test --emulator --app='fennec' --address=127.0.0.1:2828
 
 To connect to an already-running Fennec in an already running emulator or on a device, you will need to enable Marionette manually by setting the browser preference
 `marionette.enabled` set to true in the Fennec profile.
 
 Make sure port 2828 is forwarded:
 
 	% adb forward tcp:2828 tcp:2828
 
 If Fennec is already started:
 
-    % ./mach marionette-test --app='fennec' --address=127.0.0.1:2828 --disable-e10s
+    % ./mach marionette-test --app='fennec' --address=127.0.0.1:2828
 
 If Fennec is not already started on the emulator/device, add the `--emulator`
 option. Marionette Test Runner will take care of forwarding the port and
 starting Fennec with the correct prefs. (You may need to run
 `adb forward --remove-all` to allow the runner to start.)
 
     % ./mach marionette-test --emulator --app='fennec' --address=127.0.0.1:2828 --disable-e10s
     --startup-timeout=300
--- a/testing/marionette/mach_commands.py
+++ b/testing/marionette/mach_commands.py
@@ -73,11 +73,16 @@ class MarionetteTest(MachCommandBase):
              )
     def marionette_test(self, tests, **kwargs):
         if "test_objects" in kwargs:
             tests = []
             for obj in kwargs["test_objects"]:
                 tests.append(obj["file_relpath"])
             del kwargs["test_objects"]
 
+        # Force disable e10s because it is not supported in Fennec
+        if "fennec" in kwargs.get("app"):
+            kwargs["e10s"] = False
+
         if not kwargs.get("binary") and conditions.is_firefox(self):
             kwargs["binary"] = self.get_binary_path("app")
+
         return run_marionette(tests, topsrcdir=self.topsrcdir, **kwargs)