Bug 1558598 - Fix up webrender options for the firefox-ui harness. r=ato,whimboo
authorKartikaya Gupta <kgupta@mozilla.com>
Sat, 29 Jun 2019 09:50:34 +0000
changeset 543521 4fa58fa41842b922726fe44ab167d68c5bee22bd
parent 543520 68c9521ac146923bf1cd8e34bb19825f805722fa
child 543522 459c8d5d00480e04949148abbf9dcfded25a8c0f
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)
reviewersato, whimboo
bugs1558598
milestone69.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 1558598 - Fix up webrender options for the firefox-ui harness. r=ato,whimboo Differential Revision: https://phabricator.services.mozilla.com/D35864
testing/mozharness/mozharness/mozilla/testing/firefox_ui_tests.py
--- a/testing/mozharness/mozharness/mozilla/testing/firefox_ui_tests.py
+++ b/testing/mozharness/mozharness/mozilla/testing/firefox_ui_tests.py
@@ -31,17 +31,17 @@ firefox_ui_tests_config_options = [
         "default": False,
         "help": "Permits a software GL implementation (such as LLVMPipe) to use the GL "
         "compositor.",
     }],
     [["--enable-webrender"], {
         "action": "store_true",
         "dest": "enable_webrender",
         "default": False,
-        "help": "Tries to enable the WebRender compositor.",
+        "help": "Enable the WebRender compositor in Gecko.",
     }],
     [['--dry-run'], {
         'dest': 'dry_run',
         'default': False,
         'help': 'Only show what was going to be tested.',
     }],
     [["--disable-e10s"], {
         'dest': 'e10s',
@@ -229,16 +229,19 @@ class FirefoxUITests(TestingMixin, VCSTo
             # additional reports helpful for Jenkins and inpection via Treeherder
             '--log-html', os.path.join(dirs['abs_blob_upload_dir'], 'report.html'),
             '--log-xunit', os.path.join(dirs['abs_blob_upload_dir'], 'report.xml'),
 
             # Enable tracing output to log transmission protocol
             '-vv',
         ]
 
+        if self.config['enable_webrender']:
+            cmd.append('--enable-webrender')
+
         # Collect all pass-through harness options to the script
         cmd.extend(self.query_harness_args())
 
         if not self.config.get('e10s'):
             cmd.append('--disable-e10s')
 
         if self.symbols_url:
             cmd.extend(['--symbols-path', self.symbols_url])
@@ -264,19 +267,16 @@ class FirefoxUITests(TestingMixin, VCSTo
         # If code coverage is enabled, set GCOV_PREFIX and JS_CODE_COVERAGE_OUTPUT_DIR
         # env variables
         if self.config.get('code_coverage'):
             env['GCOV_PREFIX'] = self.gcov_dir
             env['JS_CODE_COVERAGE_OUTPUT_DIR'] = self.jsvm_dir
 
         if self.config['allow_software_gl_layers']:
             env['MOZ_LAYERS_ALLOW_SOFTWARE_GL'] = '1'
-        if self.config['enable_webrender']:
-            env['MOZ_WEBRENDER'] = '1'
-            env['MOZ_ACCELERATED'] = '1'
 
         return_code = self.run_command(cmd,
                                        cwd=dirs['abs_fxui_dir'],
                                        output_timeout=1000,
                                        output_parser=parser,
                                        env=env)
 
         tbpl_status, log_level, summary = parser.evaluate_parser(return_code)