Bug 1558598 - Fix up webrender options for the AWSY harness. r=ato
authorKartikaya Gupta <kgupta@mozilla.com>
Sat, 29 Jun 2019 09:50:30 +0000
changeset 543520 68c9521ac146923bf1cd8e34bb19825f805722fa
parent 543519 ee677b549b512c7c782e254f0a555ab1be5cb148
child 543521 4fa58fa41842b922726fe44ab167d68c5bee22bd
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
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 AWSY harness. r=ato AWSY is built on marionette, so it inherits the option by default, we mostly just need to propagate it properly. This also drops the --disable-webrender option as it is now implied if --enable-webrender is not provided. Differential Revision: https://phabricator.services.mozilla.com/D35863
taskcluster/taskgraph/transforms/tests.py
testing/awsy/mach_commands.py
testing/mozharness/scripts/awsy_script.py
--- a/taskcluster/taskgraph/transforms/tests.py
+++ b/taskcluster/taskgraph/transforms/tests.py
@@ -1128,21 +1128,16 @@ def enable_webrender(config, tests):
     """
     Handle the "webrender" property by passing a flag to mozharness if it is
     enabled.
     """
     for test in tests:
         if test.get('webrender'):
             test['mozharness'].setdefault('extra-options', [])\
                               .append("--enable-webrender")
-        # Explicitly disable WebRender on non-WR AWSY, since that job runs on
-        # virtual-with-gpu and thus is considered qualified hardware.
-        elif test['suite'] == 'awsy':
-            test['mozharness'].setdefault('extra-options', [])\
-                              .append("--disable-webrender")
 
         yield test
 
 
 @transforms.add
 def set_retry_exit_status(config, tests):
     """Set the retry exit status to TBPL_RETRY, the value returned by mozharness
        scripts to indicate a transient failure that should be retried."""
--- a/testing/awsy/mach_commands.py
+++ b/testing/awsy/mach_commands.py
@@ -68,20 +68,16 @@ class MachCommands(MachCommandBase):
             kwargs['perTabPause'] = 1
             kwargs['settleWaitTime'] = 1
 
         if 'single_stylo_traversal' in kwargs and kwargs['single_stylo_traversal']:
             os.environ['STYLO_THREADS'] = '1'
         else:
             os.environ['STYLO_THREADS'] = '4'
 
-        if 'enable_webrender' in kwargs and kwargs['enable_webrender']:
-            os.environ['MOZ_WEBRENDER'] = '1'
-            os.environ['MOZ_ACCELERATED'] = '1'
-
         runtime_testvars = {}
         for arg in ('webRootDir', 'pageManifest', 'resultsDir', 'entities', 'iterations',
                     'perTabPause', 'settleWaitTime', 'maxTabs', 'dmd', 'tp6'):
             if arg in kwargs and kwargs[arg] is not None:
                 runtime_testvars[arg] = kwargs[arg]
 
         if 'webRootDir' not in runtime_testvars:
             awsy_tests_dir = os.path.join(self.topobjdir, '_tests', 'awsy')
@@ -231,19 +227,16 @@ class MachCommands(MachCommandBase):
                      'Defaults to %s.' % PER_TAB_PAUSE)
     @CommandArgument('--settle-wait-time', group='AWSY', action='store', type=int,
                      dest='settleWaitTime',
                      help='Seconds to wait for things to settled down. '
                      'Defaults to %s.' % SETTLE_WAIT_TIME)
     @CommandArgument('--single-stylo-traversal', group='AWSY', action='store_true',
                      dest='single_stylo_traversal', default=False,
                      help='Set STYLO_THREADS=1.')
-    @CommandArgument('--enable-webrender', group='AWSY', action='store_true',
-                     dest='enable_webrender', default=False,
-                     help='Enable WebRender.')
     @CommandArgument('--dmd', group='AWSY', action='store_true',
                      dest='dmd', default=False,
                      help='Enable DMD during testing. Requires a DMD-enabled build.')
     @CommandArgument('--tp6', group='AWSY', action='store_true',
                      dest='tp6', default=False,
                      help='Use the tp6 pageset during testing.')
     def run_awsy_test(self, tests, **kwargs):
         """mach awsy-test runs the in-tree version of the Are We Slim Yet
--- a/testing/mozharness/scripts/awsy_script.py
+++ b/testing/mozharness/scripts/awsy_script.py
@@ -49,23 +49,17 @@ class AWSY(TestingMixin, MercurialScript
           "dest": "single_stylo_traversal",
           "default": False,
           "help": "Set STYLO_THREADS=1.",
           }],
         [["--enable-webrender"],
          {"action": "store_true",
           "dest": "enable_webrender",
           "default": False,
-          "help": "Tries to enable the WebRender compositor.",
-          }],
-        [["--disable-webrender"],
-         {"action": "store_true",
-          "dest": "disable_webrender",
-          "default": False,
-          "help": "Force-disables the WebRender compositor.",
+          "help": "Enable the WebRender compositor in Gecko.",
           }],
         [["--base"],
          {"action": "store_true",
           "dest": "test_about_blank",
           "default": False,
           "help": "Runs the about:blank base case memory test.",
           }],
         [["--dmd"],
@@ -247,33 +241,27 @@ class AWSY(TestingMixin, MercurialScript
             else:
                 prefs_file = "prefs.json"
 
         cmd.append("--preferences=%s" % os.path.join(self.awsy_path, "conf", prefs_file))
         if dmd_enabled:
             cmd.append("--pref=security.sandbox.content.level:0")
         cmd.append(test_file)
 
+        if self.config['enable_webrender']:
+            cmd.append('--enable-webrender')
+
         if self.config['single_stylo_traversal']:
             env['STYLO_THREADS'] = '1'
         else:
             env['STYLO_THREADS'] = '4'
 
         # TODO: consider getting rid of this as stylo is enabled by default
         env['STYLO_FORCE_ENABLED'] = '1'
 
-        if self.config['enable_webrender']:
-            env['MOZ_WEBRENDER'] = '1'
-            env['MOZ_ACCELERATED'] = '1'
-
-        # Allow explicitly disabling webrender, so that we don't run WR on non-QR
-        # test platforms just because they run on qualified hardware.
-        if self.config['disable_webrender']:
-            env['MOZ_WEBRENDER'] = '0'
-
         env['MOZ_UPLOAD_DIR'] = dirs['abs_blob_upload_dir']
         if not os.path.isdir(env['MOZ_UPLOAD_DIR']):
             self.mkdir_p(env['MOZ_UPLOAD_DIR'])
         if self.query_minidump_stackwalk():
             env['MINIDUMP_STACKWALK'] = self.minidump_stackwalk_path
         env['MINIDUMP_SAVE_PATH'] = dirs['abs_blob_upload_dir']
         env['RUST_BACKTRACE'] = '1'
         env = self.query_env(partial_env=env)