Bug 1528236 - [raptor] Environment variables should not be set via extra args. r=perftest-reviewers,rwood
☠☠ backed out by 304607e12723 ☠ ☠
authorHenrik Skupin <mail@hskupin.info>
Tue, 14 May 2019 19:32:15 +0000
changeset 532643 90a51dbd6ee1126091052281424dfd8fb46fb119
parent 532642 ed679c1e266d2beb10cd491f710fb6021e37c158
child 532644 d12eb6d840fc2dbbf0746b3dbbbd0ca34352ca75
push id11270
push userrgurzau@mozilla.com
push dateWed, 15 May 2019 15:07:19 +0000
treeherdermozilla-beta@571bc76da583 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersperftest-reviewers, rwood
bugs1528236
milestone68.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 1528236 - [raptor] Environment variables should not be set via extra args. r=perftest-reviewers,rwood Differential Revision: https://phabricator.services.mozilla.com/D29333
testing/raptor/raptor/raptor.py
--- a/testing/raptor/raptor/raptor.py
+++ b/testing/raptor/raptor/raptor.py
@@ -881,27 +881,31 @@ class RaptorAndroid(Raptor):
         proxy_prefs["network.proxy.ssl"] = self.config['host']
         proxy_prefs["network.proxy.ssl_port"] = 8080
         proxy_prefs["network.proxy.no_proxies_on"] = self.config['host']
         self.profile.set_preferences(proxy_prefs)
 
     def launch_firefox_android_app(self, test_name):
         self.log.info("starting %s" % self.config['app'])
 
-        extra_args = ["-profile", self.remote_profile,
-                      "--es", "env0", "LOG_VERBOSE=1",
-                      "--es", "env1", "R_LOG_LEVEL=6"]
+        extra_args = ["-profile", self.remote_profile]
+
+        env = {
+            'LOG_VERBOSE': '1',
+            'R_LOG_LEVEL': '6',
+        }
 
         try:
             # make sure the android app is not already running
             self.device.stop_application(self.config['binary'])
 
             if self.config['app'] == "fennec":
                 self.device.launch_fennec(self.config['binary'],
                                           extra_args=extra_args,
+                                          moz_env=env,
                                           url='about:blank',
                                           fail_if_running=False)
             else:
 
                 # Additional command line arguments that the app will read and use (e.g.
                 # with a custom profile)
                 extras = {}
                 if extra_args:
@@ -909,16 +913,17 @@ class RaptorAndroid(Raptor):
 
                 # add e10s=True
                 extras['use_multiprocess'] = self.config['e10s']
 
                 self.device.launch_application(self.config['binary'],
                                                self.config['activity'],
                                                self.config['intent'],
                                                extras=extras,
+                                               moz_env=env,
                                                url='about:blank',
                                                fail_if_running=False)
 
             # Check if app has started and it's running
             if not self.device.process_exist(self.config['binary']):
                 raise Exception("Error launching %s. App did not start properly!" %
                                 self.config['binary'])
         except Exception as e: