Trivial fixes for android wpt runner and gtest.
MANUAL PUSH: Trivial follow-up fixes CLOSED TREE
bugzilla-url: https://bugzilla.mozilla.org/show_bug.cgi?id=1834144
gecko-commit: 8b22b4ff9e35f14a5f156b829a4dd2ee67f728c5
diff --git a/tools/wptrunner/wptrunner/browsers/firefox_android.py b/tools/wptrunner/wptrunner/browsers/firefox_android.py
index 3f5903a..7065d07 100644
--- a/tools/wptrunner/wptrunner/browsers/firefox_android.py
+++ b/tools/wptrunner/wptrunner/browsers/firefox_android.py
@@ -64,7 +64,6 @@
"e10s": run_info_data["e10s"],
# desktop only
"leak_check": False,
- "stylo_threads": kwargs["stylo_threads"],
"chaos_mode_flags": kwargs["chaos_mode_flags"],
"config": config,
"install_fonts": kwargs["install_fonts"],
@@ -318,7 +317,7 @@
stackwalk_binary=stackwalk_binary, certutil_binary=certutil_binary,
ca_certificate_path=ca_certificate_path, e10s=e10s,
enable_fission=enable_fission, stackfix_dir=stackfix_dir,
- leak_check=leak_check, asan=asan, stylo_threads=stylo_threads,
+ leak_check=leak_check, asan=asan,
chaos_mode_flags=chaos_mode_flags, config=config,
browser_channel=browser_channel, headless=headless, **kwargs)
@@ -344,8 +343,8 @@
self.logger.warning("Failed to remove forwarded or reversed ports: %s" % e)
super().stop(force=force)
- def get_env(self, binary, debug_info, stylo_threads, headless, chaos_mode_flags):
- env = get_environ(stylo_threads, chaos_mode_flags)
+ def get_env(self, binary, debug_info, headless, chaos_mode_flags):
+ env = get_environ(chaos_mode_flags)
env["RUST_BACKTRACE"] = "1"
del env["MOZ_DISABLE_NONLOCAL_CONNECTIONS"]
return env
