Bug 1565908 - ensure we never try to run with e10s enabled on fennec, r=sparky, a=test-only
authorGijs Kruitbosch <gijskruitbosch@gmail.com>
Fri, 19 Jul 2019 17:13:53 +0000
changeset 544649 48ed488f1c9363fb8799431013b9f3a3d09eaec0
parent 544648 b2e6876280540542727e147e2f4a5c402db422de
child 544650 57689d90bbb83eb9e2dcbb372cd316f4e63acb53
push id2131
push userffxbld-merge
push dateMon, 26 Aug 2019 18:30:20 +0000
treeherdermozilla-release@b19ffb3ca153 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssparky, test-only
bugs1565908
milestone69.0
Bug 1565908 - ensure we never try to run with e10s enabled on fennec, r=sparky, a=test-only Differential Revision: https://phabricator.services.mozilla.com/D38358
testing/raptor/raptor/raptor.py
--- a/testing/raptor/raptor/raptor.py
+++ b/testing/raptor/raptor/raptor.py
@@ -105,16 +105,19 @@ class Raptor(object):
             'power_test': power_test,
             'memory_test': memory_test,
             'cpu_test': cpu_test,
             'is_release_build': is_release_build,
             'enable_control_server_wait': memory_test,
             'e10s': e10s,
             'enable_webrender': enable_webrender,
         }
+        # We can never use e10s on fennec
+        if self.config['app'] == 'fennec':
+            self.config['e10s'] = False
 
         self.raptor_venv = os.path.join(os.getcwd(), 'raptor-venv')
         self.raptor_webext = None
         self.control_server = None
         self.playback = None
         self.benchmark = None
         self.benchmark_port = 0
         self.gecko_profiler = None
@@ -926,16 +929,17 @@ class RaptorAndroid(Raptor):
 
     def build_browser_profile(self):
         super(RaptorAndroid, self).build_browser_profile()
 
         # Merge in the android profile
         path = os.path.join(self.profile_data_dir, 'raptor-android')
         LOG.info("Merging profile: {}".format(path))
         self.profile.merge(path)
+        self.profile.set_preferences({'browser.tabs.remote.autostart': self.config['e10s']})
 
     def clear_app_data(self):
         LOG.info("clearing %s app data" % self.config['binary'])
         self.device.shell("pm clear %s" % self.config['binary'])
 
     def copy_profile_to_device(self):
         """Copy the profile to the device, and update permissions of all files."""
         if not self.device.is_app_installed(self.config['binary']):