From f6b29b417fcca4c22d12e5250acce8ef72619664 Mon Sep 17 00:00:00 2001 From: Kartikaya Gupta Date: Wed, 12 Jun 2019 13:08:43 +0000 Subject: [PATCH] Bug 1558598 - Remove --disable-webrender options from a couple of places. r=ahal This drops the --disable-webrender option (which force-disables WR) and treats the lack of an --enable-webrender as if --disable-webrender was provided. Differential Revision: https://phabricator.services.mozilla.com/D34622 --HG-- extra : moz-landing-system : lando --- taskcluster/taskgraph/transforms/tests.py | 5 ----- .../scripts/android_emulator_unittest.py | 17 ++++++----------- testing/mozharness/scripts/awsy_script.py | 14 ++++---------- 3 files changed, 10 insertions(+), 26 deletions(-) diff --git a/taskcluster/taskgraph/transforms/tests.py b/taskcluster/taskgraph/transforms/tests.py index cf115c172bf5..1e54e49c7b9a 100644 --- a/taskcluster/taskgraph/transforms/tests.py +++ b/taskcluster/taskgraph/transforms/tests.py @@ -1128,11 +1128,6 @@ def enable_webrender(config, 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 diff --git a/testing/mozharness/scripts/android_emulator_unittest.py b/testing/mozharness/scripts/android_emulator_unittest.py index 847de626ee8b..b2e048c15e15 100644 --- a/testing/mozharness/scripts/android_emulator_unittest.py +++ b/testing/mozharness/scripts/android_emulator_unittest.py @@ -93,13 +93,6 @@ class AndroidEmulatorTest(TestingMixin, BaseScript, MozbaseMixin, CodeCoverageMi "default": False, "help": "Run with WebRender enabled.", } - ], [ - ['--disable-webrender'], - {"action": "store_true", - "dest": "disable_webrender", - "default": False, - "help": "Run with WebRender force-disabled.", - } ]] + copy.deepcopy(testing_config_options) + \ copy.deepcopy(code_coverage_config_options) @@ -144,7 +137,6 @@ class AndroidEmulatorTest(TestingMixin, BaseScript, MozbaseMixin, CodeCoverageMi self.log_tbpl_level = c.get('log_tbpl_level') self.e10s = c.get('e10s') self.enable_webrender = c.get('enable_webrender') - self.disable_webrender = c.get('disable_webrender') if self.enable_webrender: # AndroidMixin uses this when launching the emulator. We only want # GLES3 if we're running WebRender @@ -288,10 +280,13 @@ class AndroidEmulatorTest(TestingMixin, BaseScript, MozbaseMixin, CodeCoverageMi if self.total_chunks is not None: cmd.extend(['--total-chunks', self.total_chunks]) - if self.disable_webrender: - cmd.extend(['--setenv', 'MOZ_WEBRENDER=0']) - elif self.enable_webrender: + # Force WebRender on or off depending on the flag, so that we don't + # have it accidentally getting enabled because the underlying hardware + # running the test becomes part of the WR-qualified set. + if self.enable_webrender: cmd.extend(['--setenv', 'MOZ_WEBRENDER=1']) + else: + cmd.extend(['--setenv', 'MOZ_WEBRENDER=0']) try_options, try_tests = self.try_args(self.test_suite) cmd.extend(try_options) diff --git a/testing/mozharness/scripts/awsy_script.py b/testing/mozharness/scripts/awsy_script.py index bd72cbedda00..a2d3656cd006 100644 --- a/testing/mozharness/scripts/awsy_script.py +++ b/testing/mozharness/scripts/awsy_script.py @@ -56,12 +56,6 @@ class AWSY(TestingMixin, MercurialScript, TooltoolMixin, CodeCoverageMixin): "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.", - }], [["--base"], {"action": "store_true", "dest": "test_about_blank", @@ -260,13 +254,13 @@ class AWSY(TestingMixin, MercurialScript, TooltoolMixin, CodeCoverageMixin): # TODO: consider getting rid of this as stylo is enabled by default env['STYLO_FORCE_ENABLED'] = '1' + # Force WebRender on or off depending on the flag, so that we don't + # have it accidentally getting enabled because the underlying hardware + # running the test becomes part of the WR-qualified set. 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']: + else: env['MOZ_WEBRENDER'] = '0' env['MOZ_UPLOAD_DIR'] = dirs['abs_blob_upload_dir']