From cbcad7a93d1e67efff320782fa4ddee25266cb83 Mon Sep 17 00:00:00 2001 From: Alexandre Lissy Date: Tue, 30 Jan 2024 06:04:48 +0000 Subject: [PATCH] Bug 1876056 - Test false-positive buildID mismatch only without forkserver r=jld Differential Revision: https://phabricator.services.mozilla.com/D199475 --- .../content/test/tabcrashed/browser_aboutRestartRequired.toml | 5 +++-- ...red.toml => browser_aboutRestartRequired_noForkServer.toml} | 10 ++-------- browser/base/moz.build | 1 + 3 files changed, 6 insertions(+), 10 deletions(-) copy browser/base/content/test/tabcrashed/{browser_aboutRestartRequired.toml => browser_aboutRestartRequired_noForkServer.toml} (51%) diff --git a/browser/base/content/test/tabcrashed/browser_aboutRestartRequired.toml b/browser/base/content/test/tabcrashed/browser_aboutRestartRequired.toml index bef06361c04a..88988434fb03 100644 --- a/browser/base/content/test/tabcrashed/browser_aboutRestartRequired.toml +++ b/browser/base/content/test/tabcrashed/browser_aboutRestartRequired.toml @@ -10,8 +10,9 @@ prefs = [ ["browser_aboutRestartRequired_basic.js"] -["browser_aboutRestartRequired_buildid_false-positive.js"] -skip-if = ["win11_2009 && msix && debug"] # bug 1823581 +# Bug 1876056: re-enable once bug 1877361 is fixed +#["browser_aboutRestartRequired_buildid_false-positive.js"] +#skip-if = ["win11_2009 && msix && debug"] # bug 1823581 ["browser_aboutRestartRequired_buildid_mismatch.js"] skip-if = ["win11_2009 && msix && debug"] # bug 1823581 diff --git a/browser/base/content/test/tabcrashed/browser_aboutRestartRequired.toml b/browser/base/content/test/tabcrashed/browser_aboutRestartRequired_noForkServer.toml similarity index 51% copy from browser/base/content/test/tabcrashed/browser_aboutRestartRequired.toml copy to browser/base/content/test/tabcrashed/browser_aboutRestartRequired_noForkServer.toml index bef06361c04a..ec045ddf79ca 100644 --- a/browser/base/content/test/tabcrashed/browser_aboutRestartRequired.toml +++ b/browser/base/content/test/tabcrashed/browser_aboutRestartRequired_noForkServer.toml @@ -6,15 +6,9 @@ support-files = ["head.js"] prefs = [ "dom.ipc.processCount=1", "dom.ipc.processPrelaunch.fission.number=0", + "dom.ipc.forkserver.enable=false", ] -["browser_aboutRestartRequired_basic.js"] - +# Bug 1876056: remove once bug 1877361 is fixed ["browser_aboutRestartRequired_buildid_false-positive.js"] skip-if = ["win11_2009 && msix && debug"] # bug 1823581 - -["browser_aboutRestartRequired_buildid_mismatch.js"] -skip-if = ["win11_2009 && msix && debug"] # bug 1823581 - -["browser_aboutRestartRequired_buildid_no-platform-ini.js"] -skip-if = ["win11_2009 && msix && debug"] # bug 1823581 diff --git a/browser/base/moz.build b/browser/base/moz.build index a501e996e25e..98c3992a5dc8 100644 --- a/browser/base/moz.build +++ b/browser/base/moz.build @@ -55,6 +55,7 @@ BROWSER_CHROME_MANIFESTS += [ "content/test/sync/browser.toml", "content/test/tabcrashed/browser.toml", "content/test/tabcrashed/browser_aboutRestartRequired.toml", + "content/test/tabcrashed/browser_aboutRestartRequired_noForkServer.toml", "content/test/tabdialogs/browser.toml", "content/test/tabMediaIndicator/browser.toml", "content/test/tabPrompts/browser.toml", -- 2.11.4.GIT