зеркало из https://github.com/mozilla/gecko-dev.git
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
This commit is contained in:
Joel Maher
Родитель
b902695d12
Коммит
ab7ae9ad03
|
|
@ -123,9 +123,6 @@ test_description_schema = Schema(
|
|||
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")
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
)
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -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 @@ class RemoteGTests(object):
|
|||
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 @@ class RemoteGTests(object):
|
|||
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 @@ class RemoteGTests(object):
|
|||
|
||||
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 @@ class remoteGtestOptions(argparse.ArgumentParser):
|
|||
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")
|
||||
|
|
|
|||
|
|
@ -32,7 +32,6 @@ class GTests(object):
|
|||
cwd,
|
||||
symbols_path=None,
|
||||
utility_path=None,
|
||||
enable_webrender=False,
|
||||
):
|
||||
"""
|
||||
Run a single C++ unit test program.
|
||||
|
|
@ -51,7 +50,7 @@ class GTests(object):
|
|||
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 @@ class GTests(object):
|
|||
|
||||
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 @@ class GTests(object):
|
|||
# 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 @@ class gtestOptions(argparse.ArgumentParser):
|
|||
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))
|
||||
|
|
|
|||
|
|
@ -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="*",
|
||||
|
|
|
|||
|
|
@ -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 @@ class GeckoInstance(object):
|
|||
workspace=None,
|
||||
verbose=0,
|
||||
headless=False,
|
||||
enable_webrender=False,
|
||||
):
|
||||
self.runner_class = Runner
|
||||
self.app_args = app_args or []
|
||||
|
|
@ -152,7 +153,6 @@ class GeckoInstance(object):
|
|||
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 @@ class GeckoInstance(object):
|
|||
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 @@ class FennecInstance(GeckoInstance):
|
|||
}
|
||||
|
||||
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,
|
||||
|
|
|
|||
|
|
@ -428,13 +428,6 @@ class BaseMarionetteArguments(ArgumentParser):
|
|||
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 @@ class BaseMarionetteTestRunner(object):
|
|||
emulator=False,
|
||||
headless=False,
|
||||
enable_fission=False,
|
||||
enable_webrender=False,
|
||||
**kwargs
|
||||
):
|
||||
self._appName = None
|
||||
|
|
@ -695,7 +687,6 @@ class BaseMarionetteTestRunner(object):
|
|||
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 @@ class BaseMarionetteTestRunner(object):
|
|||
"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 @@ class BaseMarionetteTestRunner(object):
|
|||
"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))
|
||||
|
|
|
|||
|
|
@ -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"],
|
||||
{
|
||||
|
|
|
|||
|
|
@ -238,10 +238,8 @@ class JUnitTestRunner(MochitestDesktop):
|
|||
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 @@ class JunitArgumentParser(argparse.ArgumentParser):
|
|||
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",
|
||||
|
|
|
|||
|
|
@ -1859,12 +1859,6 @@ toolbar#nav-bar {
|
|||
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 @@ toolbar#nav-bar {
|
|||
"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,
|
||||
}
|
||||
)
|
||||
|
|
|
|||
|
|
@ -78,7 +78,6 @@ info = {
|
|||
"os_version": unknown,
|
||||
"bits": unknown,
|
||||
"has_sandbox": unknown,
|
||||
"webrender": False,
|
||||
"automation": bool(os.environ.get("MOZ_AUTOMATION", False)),
|
||||
}
|
||||
(system, node, release, version, machine, processor) = platform.uname()
|
||||
|
|
|
|||
|
|
@ -37,15 +37,6 @@ firefox_ui_tests_config_options = (
|
|||
"compositor.",
|
||||
},
|
||||
],
|
||||
[
|
||||
["--enable-webrender"],
|
||||
{
|
||||
"action": "store_true",
|
||||
"dest": "enable_webrender",
|
||||
"default": False,
|
||||
"help": "Enable the WebRender compositor in Gecko.",
|
||||
},
|
||||
],
|
||||
[
|
||||
["--dry-run"],
|
||||
{
|
||||
|
|
@ -297,9 +288,6 @@ class FirefoxUITests(TestingMixin, VCSToolsScript, CodeCoverageMixin):
|
|||
"-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())
|
||||
|
||||
|
|
|
|||
|
|
@ -216,15 +216,6 @@ class Raptor(
|
|||
"help": "Extra options to Raptor.",
|
||||
},
|
||||
],
|
||||
[
|
||||
["--enable-webrender"],
|
||||
{
|
||||
"action": "store_true",
|
||||
"dest": "enable_webrender",
|
||||
"default": False,
|
||||
"help": "Enable the WebRender compositor in Gecko.",
|
||||
},
|
||||
],
|
||||
[
|
||||
["--device-name"],
|
||||
{
|
||||
|
|
@ -915,8 +906,6 @@ class Raptor(
|
|||
options.extend(["--disable-perf-tuning"])
|
||||
if self.config.get("cold", False):
|
||||
options.extend(["--cold"])
|
||||
if self.config.get("enable_webrender", False):
|
||||
options.extend(["--enable-webrender"])
|
||||
if self.config.get("enable_fission", False):
|
||||
options.extend(["--enable-fission"])
|
||||
if self.config.get("verbose", False):
|
||||
|
|
|
|||
|
|
@ -207,15 +207,6 @@ class Talos(
|
|||
"help": "Run without multiple processes (e10s).",
|
||||
},
|
||||
],
|
||||
[
|
||||
["--enable-webrender"],
|
||||
{
|
||||
"action": "store_true",
|
||||
"dest": "enable_webrender",
|
||||
"default": False,
|
||||
"help": "Enable the WebRender compositor in Gecko.",
|
||||
},
|
||||
],
|
||||
[
|
||||
["--enable-fission"],
|
||||
{
|
||||
|
|
@ -536,8 +527,6 @@ class Talos(
|
|||
options.extend(
|
||||
["--setpref={}".format(p) for p in self.config["extra_prefs"]]
|
||||
)
|
||||
if self.config["enable_webrender"]:
|
||||
options.extend(["--enable-webrender"])
|
||||
# enabling fission can come from the --enable-fission cmd line argument; or in CI
|
||||
# it comes from a taskcluster transform which adds a --setpref for fission.autostart
|
||||
if (
|
||||
|
|
|
|||
|
|
@ -95,15 +95,6 @@ class AndroidEmulatorTest(
|
|||
"help": "Set log level (debug|info|warning|error|critical|fatal)",
|
||||
},
|
||||
],
|
||||
[
|
||||
["--enable-webrender"],
|
||||
{
|
||||
"action": "store_true",
|
||||
"dest": "enable_webrender",
|
||||
"default": False,
|
||||
"help": "Run with WebRender enabled.",
|
||||
},
|
||||
],
|
||||
[
|
||||
["--enable-fission"],
|
||||
{
|
||||
|
|
@ -174,11 +165,9 @@ class AndroidEmulatorTest(
|
|||
self.device_serial = "emulator-5554"
|
||||
self.log_raw_level = c.get("log_raw_level")
|
||||
self.log_tbpl_level = c.get("log_tbpl_level")
|
||||
self.enable_webrender = c.get("enable_webrender")
|
||||
if self.enable_webrender:
|
||||
# AndroidMixin uses this when launching the emulator. We only want
|
||||
# GLES3 if we're running WebRender
|
||||
self.use_gles3 = True
|
||||
# AndroidMixin uses this when launching the emulator. We only want
|
||||
# GLES3 if we're running WebRender (default)
|
||||
self.use_gles3 = True
|
||||
self.enable_fission = c.get("enable_fission")
|
||||
self.extra_prefs = c.get("extra_prefs")
|
||||
|
||||
|
|
@ -314,13 +303,6 @@ class AndroidEmulatorTest(
|
|||
if self.total_chunks is not None:
|
||||
cmd.extend(["--total-chunks", self.total_chunks])
|
||||
|
||||
# Only enable WebRender if the flag is enabled. All downstream harnesses
|
||||
# are expected to force-disable WebRender if not explicitly enabled,
|
||||
# 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(["--enable-webrender"])
|
||||
if self.enable_fission:
|
||||
cmd.extend(["--enable-fission"])
|
||||
|
||||
|
|
|
|||
|
|
@ -80,15 +80,6 @@ class AndroidHardwareTest(
|
|||
"help": "Set log level (debug|info|warning|error|critical|fatal)",
|
||||
},
|
||||
],
|
||||
[
|
||||
["--enable-webrender"],
|
||||
{
|
||||
"action": "store_true",
|
||||
"dest": "enable_webrender",
|
||||
"default": False,
|
||||
"help": "Run with WebRender enabled.",
|
||||
},
|
||||
],
|
||||
[
|
||||
["--enable-fission"],
|
||||
{
|
||||
|
|
@ -166,7 +157,6 @@ class AndroidHardwareTest(
|
|||
self.xre_path = None
|
||||
self.log_raw_level = c.get("log_raw_level")
|
||||
self.log_tbpl_level = c.get("log_tbpl_level")
|
||||
self.enable_webrender = c.get("enable_webrender")
|
||||
self.enable_fission = c.get("enable_fission")
|
||||
self.extra_prefs = c.get("extra_prefs")
|
||||
self.jittest_flags = c.get("jittest_flags")
|
||||
|
|
@ -289,13 +279,6 @@ class AndroidHardwareTest(
|
|||
else:
|
||||
self.log("--repeat not supported in {}".format(category), level=WARNING)
|
||||
|
||||
# Only enable WebRender if the flag is enabled. All downstream harnesses
|
||||
# are expected to force-disable WebRender if not explicitly enabled,
|
||||
# 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(["--enable-webrender"])
|
||||
if self.enable_fission:
|
||||
cmd.extend(["--enable-fission"])
|
||||
|
||||
|
|
|
|||
|
|
@ -59,15 +59,6 @@ class AWSY(TestingMixin, MercurialScript, TooltoolMixin, CodeCoverageMixin):
|
|||
"help": "Extra user prefs.",
|
||||
},
|
||||
],
|
||||
[
|
||||
["--enable-webrender"],
|
||||
{
|
||||
"action": "store_true",
|
||||
"dest": "enable_webrender",
|
||||
"default": False,
|
||||
"help": "Enable the WebRender compositor in Gecko.",
|
||||
},
|
||||
],
|
||||
[
|
||||
["--base"],
|
||||
{
|
||||
|
|
@ -293,9 +284,6 @@ class AWSY(TestingMixin, MercurialScript, TooltoolMixin, CodeCoverageMixin):
|
|||
cmd.append("--setpref=security.sandbox.content.level=0")
|
||||
cmd.append(test_file)
|
||||
|
||||
if self.config["enable_webrender"]:
|
||||
cmd.append("--enable-webrender")
|
||||
|
||||
env["STYLO_THREADS"] = "4"
|
||||
|
||||
env["MOZ_UPLOAD_DIR"] = dirs["abs_blob_upload_dir"]
|
||||
|
|
|
|||
|
|
@ -209,15 +209,6 @@ class DesktopUnittest(TestingMixin, MercurialScript, MozbaseMixin, CodeCoverageM
|
|||
"the GL compositor.",
|
||||
},
|
||||
],
|
||||
[
|
||||
["--enable-webrender"],
|
||||
{
|
||||
"action": "store_true",
|
||||
"dest": "enable_webrender",
|
||||
"default": False,
|
||||
"help": "Enable the WebRender compositor in Gecko.",
|
||||
},
|
||||
],
|
||||
[
|
||||
["--threads"],
|
||||
{
|
||||
|
|
@ -616,9 +607,6 @@ class DesktopUnittest(TestingMixin, MercurialScript, MozbaseMixin, CodeCoverageM
|
|||
if c["headless"]:
|
||||
base_cmd.append("--headless")
|
||||
|
||||
if c["enable_webrender"]:
|
||||
base_cmd.append("--enable-webrender")
|
||||
|
||||
if c.get("threads"):
|
||||
base_cmd.extend(["--threads", c["threads"]])
|
||||
|
||||
|
|
|
|||
|
|
@ -145,15 +145,6 @@ class MarionetteTest(TestingMixin, MercurialScript, TransferMixin, CodeCoverageM
|
|||
"help": "Permits a software GL implementation (such as LLVMPipe) to use the GL compositor.", # NOQA: E501
|
||||
},
|
||||
],
|
||||
[
|
||||
["--enable-webrender"],
|
||||
{
|
||||
"action": "store_true",
|
||||
"dest": "enable_webrender",
|
||||
"default": False,
|
||||
"help": "Enable the WebRender compositor in Gecko.",
|
||||
},
|
||||
],
|
||||
]
|
||||
+ copy.deepcopy(testing_config_options)
|
||||
+ copy.deepcopy(code_coverage_config_options)
|
||||
|
|
@ -339,9 +330,6 @@ class MarionetteTest(TestingMixin, MercurialScript, TransferMixin, CodeCoverageM
|
|||
if self.config.get("app_arg"):
|
||||
config_fmt_args["app_arg"] = self.config["app_arg"]
|
||||
|
||||
if self.config["enable_webrender"]:
|
||||
cmd.append("--enable-webrender")
|
||||
|
||||
cmd.extend(["--setpref={}".format(p) for p in self.config["extra_prefs"]])
|
||||
|
||||
cmd.append("--gecko-log=-")
|
||||
|
|
|
|||
|
|
@ -39,15 +39,6 @@ telemetry_tests_config_options = (
|
|||
"to use the GL compositor.",
|
||||
},
|
||||
],
|
||||
[
|
||||
["--enable-webrender"],
|
||||
{
|
||||
"action": "store_true",
|
||||
"dest": "enable_webrender",
|
||||
"default": False,
|
||||
"help": "Enable the WebRender compositor in Gecko.",
|
||||
},
|
||||
],
|
||||
[
|
||||
["--dry-run"],
|
||||
{
|
||||
|
|
@ -201,9 +192,6 @@ class TelemetryTests(TestingMixin, VCSToolsScript, CodeCoverageMixin):
|
|||
"-vv",
|
||||
]
|
||||
|
||||
if self.config["enable_webrender"]:
|
||||
cmd.extend(["--enable-webrender"])
|
||||
|
||||
cmd.extend(["--setpref={}".format(p) for p in self.config["extra_prefs"]])
|
||||
|
||||
if not self.config["e10s"]:
|
||||
|
|
|
|||
|
|
@ -80,15 +80,6 @@ class WebPlatformTest(TestingMixin, MercurialScript, CodeCoverageMixin, AndroidM
|
|||
"to use the GL compositor.",
|
||||
},
|
||||
],
|
||||
[
|
||||
["--enable-webrender"],
|
||||
{
|
||||
"action": "store_true",
|
||||
"dest": "enable_webrender",
|
||||
"default": False,
|
||||
"help": "Enable the WebRender compositor in Gecko.",
|
||||
},
|
||||
],
|
||||
[
|
||||
["--headless"],
|
||||
{
|
||||
|
|
@ -236,10 +227,9 @@ class WebPlatformTest(TestingMixin, MercurialScript, CodeCoverageMixin, AndroidM
|
|||
dirs["abs_sdk_dir"] = os.path.join(work_dir, "android-sdk-linux")
|
||||
dirs["abs_avds_dir"] = os.path.join(work_dir, "android-device")
|
||||
dirs["abs_bundletool_path"] = os.path.join(work_dir, "bundletool.jar")
|
||||
if self.config["enable_webrender"]:
|
||||
# AndroidMixin uses this when launching the emulator. We only want
|
||||
# GLES3 if we're running WebRender
|
||||
self.use_gles3 = True
|
||||
# AndroidMixin uses this when launching the emulator. We only want
|
||||
# GLES3 if we're running WebRender (default)
|
||||
self.use_gles3 = True
|
||||
|
||||
abs_dirs.update(dirs)
|
||||
self.abs_dirs = abs_dirs
|
||||
|
|
@ -359,9 +349,6 @@ class WebPlatformTest(TestingMixin, MercurialScript, CodeCoverageMixin, AndroidM
|
|||
if not c["e10s"]:
|
||||
cmd.append("--disable-e10s")
|
||||
|
||||
if c["enable_webrender"]:
|
||||
cmd.append("--enable-webrender")
|
||||
|
||||
if c["skip_timeout"]:
|
||||
cmd.append("--skip-timeout")
|
||||
|
||||
|
|
|
|||
|
|
@ -4,3 +4,5 @@
|
|||
|
||||
// This is useful for testing a pref on try.
|
||||
/* globals user_pref */
|
||||
// ensure webrender is set (and we don't need MOZ_WEBRENDER env variable)
|
||||
user_pref("gfx.webrender.all", true);
|
||||
|
|
|
|||
|
|
@ -49,8 +49,6 @@ user_pref("extensions.getAddons.discovery.api_url", "data:;base64,eyJyZXN1bHRzIj
|
|||
user_pref("extensions.webextensions.warnings-as-errors", true);
|
||||
// Disable useragent updates.
|
||||
user_pref("general.useragent.updates.enabled", false);
|
||||
// Ensure WR doesn't get enabled in tests unless we do it explicitly with the MOZ_WEBRENDER envvar.
|
||||
user_pref("gfx.webrender.all.qualified", false);
|
||||
user_pref("hangmonitor.timeout", 0); // no hang monitor
|
||||
user_pref("media.gmp-manager.updateEnabled", false);
|
||||
// Don't do network connections for mitm priming
|
||||
|
|
|
|||
|
|
@ -276,13 +276,6 @@ def create_parser(mach_interface=False):
|
|||
default=True,
|
||||
help="Run without multiple processes (e10s).",
|
||||
)
|
||||
add_arg(
|
||||
"--enable-webrender",
|
||||
dest="enable_webrender",
|
||||
action="store_true",
|
||||
default=False,
|
||||
help="Enable the WebRender compositor in Gecko.",
|
||||
)
|
||||
add_arg(
|
||||
"--device-name",
|
||||
dest="device_name",
|
||||
|
|
|
|||
|
|
@ -243,10 +243,7 @@ def write_test_settings_json(args, test_details, oskey):
|
|||
# if Gecko profiling is enabled, write profiling settings for webext
|
||||
if test_details.get("gecko_profile", False):
|
||||
threads = ["GeckoMain", "Compositor"]
|
||||
|
||||
# With WebRender enabled profile some extra threads
|
||||
if os.getenv("MOZ_WEBRENDER") == "1":
|
||||
threads.extend(["Renderer", "WR"])
|
||||
threads.extend(["Renderer", "WR"])
|
||||
|
||||
if test_details.get("gecko_profile_threads"):
|
||||
# pylint --py3k: W1639
|
||||
|
|
|
|||
|
|
@ -93,7 +93,6 @@ class Perftest(object):
|
|||
post_startup_delay=POST_DELAY_DEFAULT,
|
||||
interrupt_handler=None,
|
||||
e10s=True,
|
||||
enable_webrender=False,
|
||||
results_handler_class=RaptorResultsHandler,
|
||||
device_name=None,
|
||||
disable_perf_tuning=False,
|
||||
|
|
@ -136,7 +135,6 @@ class Perftest(object):
|
|||
"is_release_build": is_release_build,
|
||||
"enable_control_server_wait": memory_test or cpu_test,
|
||||
"e10s": e10s,
|
||||
"enable_webrender": enable_webrender,
|
||||
"device_name": device_name,
|
||||
"enable_fission": extra_prefs.get("fission.autostart", False),
|
||||
"disable_perf_tuning": disable_perf_tuning,
|
||||
|
|
@ -204,11 +202,6 @@ class Perftest(object):
|
|||
else:
|
||||
self.post_startup_delay = post_startup_delay
|
||||
|
||||
if self.config["enable_webrender"]:
|
||||
self.config["environment"]["MOZ_WEBRENDER"] = "1"
|
||||
else:
|
||||
self.config["environment"]["MOZ_WEBRENDER"] = "0"
|
||||
|
||||
LOG.info("Post startup delay set to %d ms" % self.post_startup_delay)
|
||||
LOG.info("main raptor init, config is: %s" % str(self.config))
|
||||
self.build_browser_profile()
|
||||
|
|
@ -720,8 +713,6 @@ class PerftestDesktop(Perftest):
|
|||
|
||||
def __init__(self, *args, **kwargs):
|
||||
super(PerftestDesktop, self).__init__(*args, **kwargs)
|
||||
if self.config["enable_webrender"]:
|
||||
self.config["environment"]["MOZ_ACCELERATED"] = "1"
|
||||
|
||||
def setup_chrome_args(self, test):
|
||||
"""Sets up chrome/chromium cmd-line arguments.
|
||||
|
|
|
|||
|
|
@ -139,7 +139,6 @@ def main(args=sys.argv[1:]):
|
|||
activity=args.activity,
|
||||
intent=args.intent,
|
||||
interrupt_handler=SignalHandler(),
|
||||
enable_webrender=args.enable_webrender,
|
||||
extra_prefs=args.extra_prefs or {},
|
||||
environment=args.environment or {},
|
||||
device_name=args.device_name,
|
||||
|
|
|
|||
|
|
@ -41,7 +41,6 @@ class PerftestResultsHandler(object):
|
|||
app=None,
|
||||
conditioned_profile=None,
|
||||
cold=False,
|
||||
enable_webrender=False,
|
||||
chimera=False,
|
||||
**kwargs
|
||||
):
|
||||
|
|
@ -59,7 +58,6 @@ class PerftestResultsHandler(object):
|
|||
self.fission_enabled = kwargs.get("extra_prefs", {}).get(
|
||||
"fission.autostart", False
|
||||
)
|
||||
self.webrender_enabled = enable_webrender
|
||||
self.browser_version = None
|
||||
self.browser_name = None
|
||||
self.cold = cold
|
||||
|
|
@ -91,8 +89,7 @@ class PerftestResultsHandler(object):
|
|||
extra_options.append("gecko-profile")
|
||||
if self.cold:
|
||||
extra_options.append("cold")
|
||||
if self.webrender_enabled:
|
||||
extra_options.append("webrender")
|
||||
extra_options.append("webrender")
|
||||
else:
|
||||
for modifier, name in modifiers:
|
||||
if not modifier:
|
||||
|
|
@ -105,14 +102,10 @@ class PerftestResultsHandler(object):
|
|||
% name
|
||||
)
|
||||
|
||||
if (
|
||||
self.app.lower()
|
||||
in (
|
||||
"chrome",
|
||||
"chrome-m",
|
||||
"chromium",
|
||||
)
|
||||
and "webrender" in extra_options
|
||||
if self.app.lower() in (
|
||||
"chrome",
|
||||
"chrome-m",
|
||||
"chromium",
|
||||
):
|
||||
extra_options.remove("webrender")
|
||||
|
||||
|
|
@ -266,7 +259,6 @@ class RaptorResultsHandler(PerftestResultsHandler):
|
|||
"condprof-%s" % self.conditioned_profile,
|
||||
),
|
||||
(self.fission_enabled, "fission"),
|
||||
(self.webrender_enabled, "webrender"),
|
||||
]
|
||||
)
|
||||
)
|
||||
|
|
|
|||
|
|
@ -86,7 +86,6 @@ class WebExtensionAndroid(PerftestAndroid, WebExtension):
|
|||
env=dict(
|
||||
LOG_VERBOSE=1,
|
||||
R_LOG_LEVEL=6,
|
||||
MOZ_WEBRENDER=int(self.config["enable_webrender"]),
|
||||
),
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -41,12 +41,6 @@ class WebExtensionDesktop(PerftestDesktop, WebExtension):
|
|||
# Force Firefox to immediately exit for content crashes
|
||||
self.runner.env["MOZ_CRASHREPORTER_SHUTDOWN"] = "1"
|
||||
|
||||
if self.config["enable_webrender"]:
|
||||
self.runner.env["MOZ_WEBRENDER"] = "1"
|
||||
self.runner.env["MOZ_ACCELERATED"] = "1"
|
||||
else:
|
||||
self.runner.env["MOZ_WEBRENDER"] = "0"
|
||||
|
||||
self.runner.env.update(self.config.get("environment", {}))
|
||||
|
||||
def launch_desktop_browser(self, test):
|
||||
|
|
|
|||
|
|
@ -27,7 +27,6 @@ def test_verify_options(filedir):
|
|||
power_test=False,
|
||||
cpu_test=False,
|
||||
memory_test=False,
|
||||
enable_webrender=False,
|
||||
chimera=False,
|
||||
browsertime_video=False,
|
||||
browsertime_visualmetrics=False,
|
||||
|
|
@ -51,7 +50,6 @@ def test_verify_options(filedir):
|
|||
power_test=False,
|
||||
cpu_test=False,
|
||||
memory_test=False,
|
||||
enable_webrender=False,
|
||||
chimera=False,
|
||||
browsertime_video=False,
|
||||
browsertime_visualmetrics=False,
|
||||
|
|
@ -69,7 +67,6 @@ def test_verify_options(filedir):
|
|||
power_test=False,
|
||||
cpu_test=False,
|
||||
memory_test=False,
|
||||
enable_webrender=False,
|
||||
chimera=False,
|
||||
browsertime_video=False,
|
||||
browsertime_visualmetrics=False,
|
||||
|
|
@ -87,7 +84,6 @@ def test_verify_options(filedir):
|
|||
power_test=False,
|
||||
cpu_test=False,
|
||||
memory_test=False,
|
||||
enable_webrender=False,
|
||||
chimera=False,
|
||||
browsertime_video=False,
|
||||
browsertime_visualmetrics=False,
|
||||
|
|
@ -105,7 +101,6 @@ def test_verify_options(filedir):
|
|||
power_test=False,
|
||||
cpu_test=True,
|
||||
memory_test=False,
|
||||
enable_webrender=False,
|
||||
chimera=False,
|
||||
browsertime_video=False,
|
||||
browsertime_visualmetrics=False,
|
||||
|
|
@ -123,7 +118,6 @@ def test_verify_options(filedir):
|
|||
power_test=False,
|
||||
cpu_test=False,
|
||||
memory_test=False,
|
||||
enable_webrender=False,
|
||||
chimera=False,
|
||||
browsertime_video=False,
|
||||
browsertime_visualmetrics=False,
|
||||
|
|
|
|||
|
|
@ -100,8 +100,8 @@ class RemoteCPPUnitTests(cppunittests.CPPUnitTests):
|
|||
)
|
||||
self.device.push(local_file, remote_file)
|
||||
|
||||
def build_environment(self, enable_webrender=False):
|
||||
env = self.build_core_environment({}, enable_webrender)
|
||||
def build_environment(self):
|
||||
env = self.build_core_environment({})
|
||||
env["LD_LIBRARY_PATH"] = self.remote_bin_dir
|
||||
env["TMPDIR"] = self.remote_tmp_dir
|
||||
env["HOME"] = self.remote_home_dir
|
||||
|
|
@ -268,7 +268,6 @@ def run_test_harness(options, args):
|
|||
progs,
|
||||
options.xre_path,
|
||||
options.symbols_path,
|
||||
enable_webrender=options.enable_webrender,
|
||||
)
|
||||
return result
|
||||
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@ class CPPUnitTests(object):
|
|||
self.log.test_end(basename, status="PASS", expected="PASS")
|
||||
return result
|
||||
|
||||
def build_core_environment(self, env, enable_webrender):
|
||||
def build_core_environment(self, env):
|
||||
"""
|
||||
Add environment variables likely to be used across all platforms, including remote systems.
|
||||
"""
|
||||
|
|
@ -112,16 +112,9 @@ class CPPUnitTests(object):
|
|||
env["XPCOM_DEBUG_BREAK"] = "stack-and-abort"
|
||||
env["MOZ_CRASHREPORTER_NO_REPORT"] = "1"
|
||||
env["MOZ_CRASHREPORTER"] = "1"
|
||||
|
||||
if enable_webrender:
|
||||
env["MOZ_WEBRENDER"] = "1"
|
||||
env["MOZ_ACCELERATED"] = "1"
|
||||
else:
|
||||
env["MOZ_WEBRENDER"] = "0"
|
||||
|
||||
return env
|
||||
|
||||
def build_environment(self, enable_webrender=False):
|
||||
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 values and are missing things
|
||||
|
|
@ -130,7 +123,7 @@ class CPPUnitTests(object):
|
|||
if not os.path.isdir(self.xre_path):
|
||||
raise Exception("xre_path does not exist: %s", self.xre_path)
|
||||
env = dict(os.environ)
|
||||
env = self.build_core_environment(env, enable_webrender)
|
||||
env = self.build_core_environment(env)
|
||||
pathvar = ""
|
||||
libpath = self.xre_path
|
||||
if mozinfo.os == "linux":
|
||||
|
|
@ -174,7 +167,6 @@ class CPPUnitTests(object):
|
|||
xre_path,
|
||||
symbols_path=None,
|
||||
utility_path=None,
|
||||
enable_webrender=False,
|
||||
interactive=False,
|
||||
):
|
||||
"""
|
||||
|
|
@ -198,7 +190,7 @@ class CPPUnitTests(object):
|
|||
utility_path, symbols_path
|
||||
)
|
||||
self.log.suite_start(programs, name="cppunittest")
|
||||
env = self.build_environment(enable_webrender)
|
||||
env = self.build_environment()
|
||||
pass_count = 0
|
||||
fail_count = 0
|
||||
for prog in programs:
|
||||
|
|
@ -256,13 +248,6 @@ class CPPUnittestOptions(OptionParser):
|
|||
default=None,
|
||||
help="path to directory containing utility programs",
|
||||
)
|
||||
self.add_option(
|
||||
"--enable-webrender",
|
||||
action="store_true",
|
||||
dest="enable_webrender",
|
||||
default=False,
|
||||
help="Enable the WebRender compositor in Gecko",
|
||||
)
|
||||
|
||||
|
||||
def extract_unittests_from_args(args, environ, manifest_path):
|
||||
|
|
@ -344,7 +329,6 @@ def run_test_harness(options, args):
|
|||
options.xre_path,
|
||||
options.symbols_path,
|
||||
options.utility_path,
|
||||
options.enable_webrender,
|
||||
)
|
||||
|
||||
return result
|
||||
|
|
|
|||
|
|
@ -311,12 +311,6 @@ def create_parser(mach_interface=False):
|
|||
" initialization but before starting the tests. NOTE:"
|
||||
" Currently only supported in production.",
|
||||
)
|
||||
add_arg(
|
||||
"--enable-webrender",
|
||||
action="store_true",
|
||||
default=False,
|
||||
help="Enable the WebRender compositor in Gecko.",
|
||||
)
|
||||
add_arg(
|
||||
"--enable-fission",
|
||||
action="store_true",
|
||||
|
|
|
|||
|
|
@ -328,7 +328,6 @@ def get_browser_config(config):
|
|||
"debugger": None,
|
||||
"debugger_args": None,
|
||||
"develop": False,
|
||||
"enable_webrender": False,
|
||||
"enable_fission": False,
|
||||
"process": "",
|
||||
"framework": "talos",
|
||||
|
|
|
|||
|
|
@ -44,8 +44,7 @@ class GeckoProfile(object):
|
|||
gecko_profile_threads = test_config.get(
|
||||
"gecko_profile_threads", "GeckoMain,Compositor"
|
||||
)
|
||||
if browser_config["enable_webrender"]:
|
||||
gecko_profile_threads += ",WR,Renderer"
|
||||
gecko_profile_threads += ",WR,Renderer"
|
||||
|
||||
# Make sure no archive already exists in the location where
|
||||
# we plan to output our profiler archive
|
||||
|
|
|
|||
|
|
@ -274,7 +274,8 @@ function FindProxyForURL(url, host) {
|
|||
# differentiate webrender from non-webrender results
|
||||
if browser_config["preferences"].get("gfx.webrender.software", False):
|
||||
talos_results.add_extra_option("webrender-sw")
|
||||
elif browser_config.get("enable_webrender", False):
|
||||
else:
|
||||
# we need to add 'webrender' so reported data is consistent
|
||||
talos_results.add_extra_option("webrender")
|
||||
|
||||
# differentiate webgl from webgl-ipc results
|
||||
|
|
|
|||
|
|
@ -103,12 +103,6 @@ class TTest(object):
|
|||
if browser_config.get("stylothreads", 0) > 0:
|
||||
setup.env["STYLO_THREADS"] = str(browser_config["stylothreads"])
|
||||
|
||||
if browser_config["enable_webrender"]:
|
||||
setup.env["MOZ_WEBRENDER"] = "1"
|
||||
setup.env["MOZ_ACCELERATED"] = "1"
|
||||
else:
|
||||
setup.env["MOZ_WEBRENDER"] = "0"
|
||||
|
||||
# set url if there is one (i.e. receiving a test page, not a manifest/pageloader test)
|
||||
if test_config.get("url", None) is not None:
|
||||
test_config["url"] = utils.interpolate(
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче