nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1887716 - Improve MOZ_FORCE_DISABLE_E10S check r=nika

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D206289
This commit is contained in:
Gregory Pappas 2024-04-01 22:58:30 +00:00
parent 80663eebde
commit 19da69d55e
4 changed files with 11 additions and 21 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

2
toolkit/xre/nsAppRunner.cpp
View file

@ -575,7 +575,7 @@ bool BrowserTabsRemoteAutostart() {
// then we could remove this automation-only env variable. // then we could remove this automation-only env variable.
if (gBrowserTabsRemoteAutostart && xpc::AreNonLocalConnectionsDisabled()) { if (gBrowserTabsRemoteAutostart && xpc::AreNonLocalConnectionsDisabled()) {
const char* forceDisable = PR_GetEnv("MOZ_FORCE_DISABLE_E10S"); const char* forceDisable = PR_GetEnv("MOZ_FORCE_DISABLE_E10S");
if (forceDisable && *forceDisable == '1') { if (forceDisable && !strcmp(forceDisable, "1")) {
gBrowserTabsRemoteAutostart = false; gBrowserTabsRemoteAutostart = false;
status = kE10sForceDisabled; status = kE10sForceDisabled;
} }

3
toolkit/xre/test/marionette/gen_win32k_tests.py
View file

@ -58,8 +58,7 @@ def set_e10s(enable):
if enable: if enable:
output.write( output.write(
""" """
app_version = self.execute_script("return Services.appinfo.version") self.restart(env={ENV_DISABLE_E10S: "1"})
self.restart(env={ENV_DISABLE_E10S: app_version})
self.set_env(ENV_DISABLE_E10S, "null")\n""" self.set_env(ENV_DISABLE_E10S, "null")\n"""
) )
else: else:

3
toolkit/xre/test/marionette/test_fission_autostart.py
View file

@ -238,8 +238,7 @@ class TestFissionAutostart(MarionetteTestCase):
decision="enabledByDefault", decision="enabledByDefault",
) )
app_version = self.execute_script("return Services.appinfo.version") self.restart(env={ENV_DISABLE_E10S: "1"})
self.restart(env={ENV_DISABLE_E10S: app_version})
self.check_fission_status( self.check_fission_status(
enabled=False, enabled=False,
decision="disabledByE10sEnv", decision="disabledByE10sEnv",

24
toolkit/xre/test/marionette/test_win32k_enrollment.py
View file

@ -389,8 +389,7 @@ class TestWin32kAutostart(MarionetteTestCase):
self.marionette.set_pref(Prefs.WIN32K, True) self.marionette.set_pref(Prefs.WIN32K, True)
app_version = self.execute_script("return Services.appinfo.version") self.restart(env={ENV_DISABLE_E10S: "1"})
self.restart(env={ENV_DISABLE_E10S: app_version})
self.set_env(ENV_DISABLE_E10S, "null") self.set_env(ENV_DISABLE_E10S, "null")
self.check_win32k_status( self.check_win32k_status(
@ -623,8 +622,7 @@ class TestWin32kAutostart(MarionetteTestCase):
self.marionette.set_pref(Prefs.WIN32K, True) self.marionette.set_pref(Prefs.WIN32K, True)
app_version = self.execute_script("return Services.appinfo.version") self.restart(env={ENV_DISABLE_E10S: "1"})
self.restart(env={ENV_DISABLE_E10S: app_version})
self.set_env(ENV_DISABLE_E10S, "null") self.set_env(ENV_DISABLE_E10S, "null")
self.check_win32k_status( self.check_win32k_status(
@ -869,8 +867,7 @@ class TestWin32kAutostart(MarionetteTestCase):
enrollmentStatusPref=ExperimentStatus.UNENROLLED, enrollmentStatusPref=ExperimentStatus.UNENROLLED,
) )
app_version = self.execute_script("return Services.appinfo.version") self.restart(env={ENV_DISABLE_E10S: "1"})
self.restart(env={ENV_DISABLE_E10S: app_version})
self.set_env(ENV_DISABLE_E10S, "null") self.set_env(ENV_DISABLE_E10S, "null")
self.check_win32k_status( self.check_win32k_status(
@ -1137,8 +1134,7 @@ class TestWin32kAutostart(MarionetteTestCase):
enrollmentStatusPref=ExperimentStatus.UNENROLLED, enrollmentStatusPref=ExperimentStatus.UNENROLLED,
) )
app_version = self.execute_script("return Services.appinfo.version") self.restart(env={ENV_DISABLE_E10S: "1"})
self.restart(env={ENV_DISABLE_E10S: app_version})
self.set_env(ENV_DISABLE_E10S, "null") self.set_env(ENV_DISABLE_E10S, "null")
self.check_win32k_status( self.check_win32k_status(
@ -1366,8 +1362,7 @@ class TestWin32kAutostart(MarionetteTestCase):
# Re-set enrollment pref, like Normandy would do # Re-set enrollment pref, like Normandy would do
self.set_enrollment_status(ExperimentStatus.ENROLLED_CONTROL) self.set_enrollment_status(ExperimentStatus.ENROLLED_CONTROL)
app_version = self.execute_script("return Services.appinfo.version") self.restart(env={ENV_DISABLE_E10S: "1"})
self.restart(env={ENV_DISABLE_E10S: app_version})
self.set_env(ENV_DISABLE_E10S, "null") self.set_env(ENV_DISABLE_E10S, "null")
self.check_win32k_status( self.check_win32k_status(
@ -1603,8 +1598,7 @@ class TestWin32kAutostart(MarionetteTestCase):
# Re-set enrollment pref, like Normandy would do # Re-set enrollment pref, like Normandy would do
self.set_enrollment_status(ExperimentStatus.ENROLLED_CONTROL) self.set_enrollment_status(ExperimentStatus.ENROLLED_CONTROL)
app_version = self.execute_script("return Services.appinfo.version") self.restart(env={ENV_DISABLE_E10S: "1"})
self.restart(env={ENV_DISABLE_E10S: app_version})
self.set_env(ENV_DISABLE_E10S, "null") self.set_env(ENV_DISABLE_E10S, "null")
self.check_win32k_status( self.check_win32k_status(
@ -1853,8 +1847,7 @@ class TestWin32kAutostart(MarionetteTestCase):
# Re-set enrollment pref, like Normandy would do # Re-set enrollment pref, like Normandy would do
self.set_enrollment_status(ExperimentStatus.ENROLLED_TREATMENT) self.set_enrollment_status(ExperimentStatus.ENROLLED_TREATMENT)
app_version = self.execute_script("return Services.appinfo.version") self.restart(env={ENV_DISABLE_E10S: "1"})
self.restart(env={ENV_DISABLE_E10S: app_version})
self.set_env(ENV_DISABLE_E10S, "null") self.set_env(ENV_DISABLE_E10S, "null")
self.check_win32k_status( self.check_win32k_status(
@ -2103,8 +2096,7 @@ class TestWin32kAutostart(MarionetteTestCase):
# Re-set enrollment pref, like Normandy would do # Re-set enrollment pref, like Normandy would do
self.set_enrollment_status(ExperimentStatus.ENROLLED_TREATMENT) self.set_enrollment_status(ExperimentStatus.ENROLLED_TREATMENT)
app_version = self.execute_script("return Services.appinfo.version") self.restart(env={ENV_DISABLE_E10S: "1"})
self.restart(env={ENV_DISABLE_E10S: app_version})
self.set_env(ENV_DISABLE_E10S, "null") self.set_env(ENV_DISABLE_E10S, "null")
self.check_win32k_status( self.check_win32k_status(