Bug 1743907 - remove webrender from harnesses and taskcluster. r=MasterWayZ,webdriver-reviewers,perftest-reviewers,AlexandruIonescu,whimboo,ahal

Differential Revision: https://phabricator.services.mozilla.com/D134715

Author: jmaher

taskcluster/gecko_taskgraph/transforms/test/__init__.py

@@ -123,9 +123,6 @@
         Required("run-without-variant"): optionally_keyed_by("test-platform", bool),
         # Whether the task should run with WebRender enabled or not.
         Optional("webrender"): bool,
-        Optional("webrender-run-on-projects"): optionally_keyed_by(
-            "app", Any([str], "default")
-        ),
         # The EC2 instance size to run these tests on.
         Required("instance-size"): optionally_keyed_by(
             "test-platform", Any("default", "large", "xlarge")

taskcluster/gecko_taskgraph/transforms/test/other.py

@@ -938,22 +938,17 @@ def enable_webrender(config, tasks):
     enabled.
     """
     for task in tasks:
-        if task.get("webrender"):
-            extra_options = task["mozharness"].setdefault("extra-options", [])
-            extra_options.append("--enable-webrender")
-            # We only want to 'setpref' on tests that have a profile
-            if not task["attributes"]["unittest_category"] in [
-                "cppunittest",
-                "geckoview-junit",
-                "gtest",
-                "jittest",
-                "raptor",
-            ]:
-                extra_options.append("--setpref=layers.d3d11.enable-blacklist=false")
-
-            # run webrender variants on the projects specified on webrender-run-on-projects
-            if task.get("webrender-run-on-projects") is not None:
-                task["run-on-projects"] = task["webrender-run-on-projects"]
+        # TODO: this was all conditionally in enable_webrender- do we still need this?
+        extra_options = task["mozharness"].setdefault("extra-options", [])
+        # We only want to 'setpref' on tests that have a profile
+        if not task["attributes"]["unittest_category"] in [
+            "cppunittest",
+            "geckoview-junit",
+            "gtest",
+            "jittest",
+            "raptor",
+        ]:
+            extra_options.append("--setpref=layers.d3d11.enable-blacklist=false")
 
         yield task
 

testing/gtest/mach_test_package_commands.py

@@ -56,13 +56,7 @@ def run_gtest_desktop(context, args):
     import rungtests
 
     tester = rungtests.GTests()
-    return tester.run_gtest(
-        prog,
-        xre_path,
-        cwd,
-        utility_path=utility_path,
-        enable_webrender=args.enable_webrender,
-    )
+    return tester.run_gtest(prog, xre_path, cwd, utility_path=utility_path)
 
 
 def run_gtest_android(context, args):
@@ -97,7 +91,6 @@ def run_gtest_android(context, args):
         args.remote_test_root,
         libxul_path,
         args.symbols_path,
-        args.enable_webrender,
     )
 
 

testing/gtest/remotegtests.py

@@ -35,7 +35,7 @@ class RemoteGTests(object):
     def __init__(self):
         self.device = None
 
-    def build_environment(self, shuffle, test_filter, enable_webrender):
+    def build_environment(self, shuffle, test_filter):
         """
         Create and return a dictionary of all the appropriate env variables
         and values.
@@ -58,10 +58,9 @@ def build_environment(self, shuffle, test_filter, enable_webrender):
             env["GTEST_SHUFFLE"] = "True"
         if test_filter:
             env["GTEST_FILTER"] = test_filter
-        if enable_webrender:
-            env["MOZ_WEBRENDER"] = "1"
-        else:
-            env["MOZ_WEBRENDER"] = "0"
+
+        # webrender needs gfx.webrender.all=true, gtest doesn't use prefs
+        env["MOZ_WEBRENDER"] = "1"
 
         return env
 
@@ -76,7 +75,6 @@ def run_gtest(
         remote_test_root,
         libxul_path,
         symbols_path,
-        enable_webrender,
     ):
         """
         Launch the test app, run gtest, collect test results and wait for completion.
@@ -121,7 +119,7 @@ def run_gtest(
 
         if test_filter is not None:
             test_filter = six.ensure_text(test_filter)
-        env = self.build_environment(shuffle, test_filter, enable_webrender)
+        env = self.build_environment(shuffle, test_filter)
         args = [
             "-unittest",
             "--gtest_death_test_style=threadsafe",
@@ -421,13 +419,6 @@ def __init__(self):
             default=None,
             help="Path to gtest directory containing test support files.",
         )
-        self.add_argument(
-            "--enable-webrender",
-            action="store_true",
-            dest="enable_webrender",
-            default=False,
-            help="Enable the WebRender compositor in Gecko.",
-        )
         self.add_argument("args", nargs=argparse.REMAINDER)
 
 
@@ -470,7 +461,6 @@ def main():
             options.remote_test_root,
             options.libxul_path,
             options.symbols_path,
-            options.enable_webrender,
         )
     except KeyboardInterrupt:
         log.info("gtest | Received keyboard interrupt")

testing/gtest/rungtests.py

@@ -32,7 +32,6 @@ def run_gtest(
         cwd,
         symbols_path=None,
         utility_path=None,
-        enable_webrender=False,
     ):
         """
         Run a single C++ unit test program.
@@ -51,7 +50,7 @@ def run_gtest(
         Return True if the program exits with a zero status, False otherwise.
         """
         self.xre_path = xre_path
-        env = self.build_environment(enable_webrender)
+        env = self.build_environment()
         log.info("Running gtest")
 
         if cwd and not os.path.isdir(cwd):
@@ -129,7 +128,7 @@ def build_core_environment(self, env={}):
 
         return env
 
-    def build_environment(self, enable_webrender):
+    def build_environment(self):
         """
         Create and return a dictionary of all the appropriate env variables
         and values. On a remote system, we overload this to set different
@@ -168,11 +167,9 @@ def build_environment(self, enable_webrender):
                 # This should be |testFail| instead of |info|. See bug 1050891.
                 log.info("gtest | Failed to find ASan symbolizer at %s", llvmsym)
 
-        if enable_webrender:
-            env["MOZ_WEBRENDER"] = "1"
-            env["MOZ_ACCELERATED"] = "1"
-        else:
-            env["MOZ_WEBRENDER"] = "0"
+        # webrender needs gfx.webrender.all=true, gtest doesn't use prefs
+        env["MOZ_WEBRENDER"] = "1"
+        env["MOZ_ACCELERATED"] = "1"
 
         return env
 
@@ -207,13 +204,6 @@ def __init__(self):
             default=None,
             help="path to a directory containing utility program binaries",
         )
-        self.add_argument(
-            "--enable-webrender",
-            action="store_true",
-            dest="enable_webrender",
-            default=False,
-            help="Enable the WebRender compositor in Gecko.",
-        )
         self.add_argument("args", nargs=argparse.REMAINDER)
 
 
@@ -253,7 +243,6 @@ def main():
             options.cwd,
             symbols_path=options.symbols_path,
             utility_path=options.utility_path,
-            enable_webrender=options.enable_webrender,
         )
     except Exception as e:
         log.error(str(e))

testing/mach_commands.py

@@ -471,13 +471,6 @@ def test(command_context, what, extra_args, **log_args):
 @Command(
     "cppunittest", category="testing", description="Run cpp unit tests (C++ tests)."
 )
-@CommandArgument(
-    "--enable-webrender",
-    action="store_true",
-    default=False,
-    dest="enable_webrender",
-    help="Enable the WebRender compositor in Gecko.",
-)
 @CommandArgument(
     "test_files",
     nargs="*",

testing/marionette/client/marionette_driver/geckoinstance.py

@@ -41,6 +41,8 @@ class GeckoInstance(object):
         # and causing false-positive test failures. See bug 1176798, bug 1177018,
         # bug 1210465.
         "apz.content_response_timeout": 60000,
+        # Don't pull Top Sites content from the network
+        "browser.topsites.contile.enabled": False,
         # Defensively disable data reporting systems
         "datareporting.healthreport.documentServerURI": "http://%(server)s/dummy/healthreport/",
         "datareporting.healthreport.logging.consoleEnabled": False,
@@ -52,6 +54,8 @@ class GeckoInstance(object):
         "datareporting.policy.dataSubmissionPolicyBypassNotification": True,
         # Automatically unload beforeunload alerts
         "dom.disable_beforeunload": True,
+        # Enabling the support for File object creation in the content process.
+        "dom.file.createInChild": True,
         # Disable the ProcessHangMonitor
         "dom.ipc.reportProcessHangs": False,
         # No slow script dialogs
@@ -83,6 +87,8 @@ class GeckoInstance(object):
         "geo.provider.testing": True,
         # Do not scan Wifi
         "geo.wifi.scan": False,
+        # Ensure webrender is on, no need for environment variables
+        "gfx.webrender.all": True,
         # Disable idle-daily notifications to avoid expensive operations
         # that may cause unexpected test timeouts.
         "idle.lastDailyNotification": -1,
@@ -112,10 +118,6 @@ class GeckoInstance(object):
         "signon.rememberSignons": False,
         # Prevent starting into safe mode after application crashes
         "toolkit.startup.max_resumed_crashes": -1,
-        # Enabling the support for File object creation in the content process.
-        "dom.file.createInChild": True,
-        # Don't pull Top Sites content from the network
-        "browser.topsites.contile.enabled": False,
     }
 
     def __init__(
@@ -132,7 +134,6 @@ def __init__(
         workspace=None,
         verbose=0,
         headless=False,
-        enable_webrender=False,
     ):
         self.runner_class = Runner
         self.app_args = app_args or []
@@ -152,7 +153,6 @@ def __init__(
         self._gecko_log = None
         self.verbose = verbose
         self.headless = headless
-        self.enable_webrender = enable_webrender
 
         # keep track of errors to decide whether instance is unresponsive
         self.unresponsive_count = 0
@@ -331,12 +331,6 @@ def _get_runner_args(self):
             env["MOZ_HEADLESS"] = "1"
             env["DISPLAY"] = "77"  # Set a fake display.
 
-        if self.enable_webrender:
-            env["MOZ_WEBRENDER"] = "1"
-            env["MOZ_ACCELERATED"] = "1"
-        else:
-            env["MOZ_WEBRENDER"] = "0"
-
         # environment variables needed for crashreporting
         # https://developer.mozilla.org/docs/Environment_variables_affecting_crash_reporting
         env.update(
@@ -483,10 +477,6 @@ def _get_runner_args(self):
         }
 
         env = {} if self.env is None else self.env.copy()
-        if self.enable_webrender:
-            env["MOZ_WEBRENDER"] = "1"
-        else:
-            env["MOZ_WEBRENDER"] = "0"
 
         runner_args = {
             "app": self.package_name,

testing/marionette/harness/marionette_harness/runner/base.py

@@ -428,13 +428,6 @@ def dir_path(path):
             default=False,
             help="Enable Fission (site isolation) in Gecko.",
         )
-        self.add_argument(
-            "--enable-webrender",
-            action="store_true",
-            dest="enable_webrender",
-            default=False,
-            help="Enable the WebRender compositor in Gecko.",
-        )
         self.add_argument(
             "-z",
             "--headless",
@@ -651,7 +644,6 @@ def __init__(
         emulator=False,
         headless=False,
         enable_fission=False,
-        enable_webrender=False,
         **kwargs
     ):
         self._appName = None
@@ -695,7 +687,6 @@ def __init__(
         self.workspace_path = workspace or os.getcwd()
         self.verbose = verbose
         self.headless = headless
-        self.enable_webrender = enable_webrender
 
         self.enable_fission = enable_fission
         if self.enable_fission:
@@ -868,7 +859,6 @@ def _build_kwargs(self):
             "startup_timeout": self.startup_timeout,
             "verbose": self.verbose,
             "symbols_path": self.symbols_path,
-            "enable_webrender": self.enable_webrender,
         }
         if self.bin or self.emulator:
             kwargs.update(
@@ -1144,7 +1134,6 @@ def add_test(self, test, expected="pass", group="default"):
                     "appname": self.appName,
                     "manage_instance": self.marionette.instance is not None,
                     "headless": self.headless,
-                    "webrender": self.enable_webrender,
                 }
             )
             self.logger.info("mozinfo updated from: {}".format(json_path))

testing/mochitest/mochitest_options.py

@@ -855,15 +855,6 @@ class MochitestArguments(ArgumentContainer):
                 "help": "Maximum time, in seconds, to run in --verify mode.",
             },
         ],
-        [
-            ["--enable-webrender"],
-            {
-                "action": "store_true",
-                "dest": "enable_webrender",
-                "default": False,
-                "help": "Enable the WebRender compositor in Gecko.",
-            },
-        ],
         [
             ["--profiler"],
             {

testing/mochitest/runjunit.py

@@ -238,10 +238,8 @@ def build_command_line(self, test_filters_file, test_filters):
         env["R_LOG_VERBOSE"] = "1"
         env["R_LOG_LEVEL"] = "6"
         env["R_LOG_DESTINATION"] = "stderr"
-        if self.options.enable_webrender:
-            env["MOZ_WEBRENDER"] = "1"
-        else:
-            env["MOZ_WEBRENDER"] = "0"
+        # webrender needs gfx.webrender.all=true, gtest doesn't use prefs
+        env["MOZ_WEBRENDER"] = "1"
         # FIXME: When android switches to using Fission by default,
         # MOZ_FORCE_DISABLE_FISSION will need to be configured correctly.
         if self.options.enable_fission:
@@ -574,13 +572,6 @@ def __init__(self, **kwargs):
             default=None,
             help="If collecting code coverage, save the report file in this dir.",
         )
-        self.add_argument(
-            "--enable-webrender",
-            action="store_true",
-            dest="enable_webrender",
-            default=False,
-            help="Enable the WebRender compositor in Gecko.",
-        )
         self.add_argument(
             "--enable-fission",
             action="store_true",

testing/mochitest/runtests.py

@@ -1859,12 +1859,6 @@ def buildBrowserEnv(self, options, debugger=False, env=None):
         if self.mozLogs:
             browserEnv["MOZ_LOG"] = MOZ_LOG
 
-        if options.enable_webrender:
-            browserEnv["MOZ_WEBRENDER"] = "1"
-            browserEnv["MOZ_ACCELERATED"] = "1"
-        else:
-            browserEnv["MOZ_WEBRENDER"] = "0"
-
         return browserEnv
 
     def killNamedProc(self, pname, orphans=True):
@@ -2882,7 +2876,6 @@ def runTests(self, options):
                 "verify": options.verify,
                 "verify_fission": options.verify_fission,
                 "webgl_ipc": self.extraPrefs.get("webgl.out-of-process", False),
-                "webrender": options.enable_webrender,
                 "xorigin": options.xOriginTests,
             }
         )