Merging upstream version 127.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 40 insertions, 4 deletions

diff --git a/testing/xpcshell/head.js b/testing/xpcshell/head.js
index b12bcbceb7..21f8a56384 100644
--- a/testing/xpcshell/head.js
+++ b/testing/xpcshell/head.js
@@ -413,7 +413,7 @@ function _setupDevToolsServer(breakpointFiles, callback) {
         "xpcshell environment.\n" +
         "This can usually be resolved by adding:\n" +
         "  firefox-appdir = browser\n" +
-        "to the xpcshell.ini manifest.\n" +
+        "to the xpcshell.toml manifest.\n" +
         "It is possible for this to alter test behevior by " +
         "triggering additional browser code to run, so check " +
         "test behavior after making this change.\n" +
diff --git a/testing/xpcshell/runxpcshelltests.py b/testing/xpcshell/runxpcshelltests.py
index 2f1d26d715..4543309782 100755
--- a/testing/xpcshell/runxpcshelltests.py
+++ b/testing/xpcshell/runxpcshelltests.py
@@ -1573,9 +1573,8 @@ class XPCShellTests(object):
 
         self.mozInfo["condprof"] = options.get("conditionedProfile", False)
 
-        self.mozInfo["msix"] = options.get(
-            "app_binary"
-        ) is not None and "WindowsApps" in options.get("app_binary", "")
+        if options.get("variant", ""):
+            self.mozInfo["msix"] = options["variant"] == "msix"
 
         self.mozInfo["is_ubuntu"] = "Ubuntu" in platform.version()
 
@@ -1786,6 +1785,14 @@ class XPCShellTests(object):
         self.crashAsPass = options.get("crashAsPass")
         self.conditionedProfile = options.get("conditionedProfile")
         self.repeat = options.get("repeat", 0)
+        self.variant = options.get("variant", "")
+
+        if self.variant == "msix":
+            self.appPath = options.get("msixAppPath")
+            self.xrePath = options.get("msixXrePath")
+            self.app_binary = options.get("msix_app_binary")
+            self.threadCount = 2
+            self.xpcshell = None
 
         self.testCount = 0
         self.passCount = 0
diff --git a/testing/xpcshell/xpcshellcommandline.py b/testing/xpcshell/xpcshellcommandline.py
index ba8bdf3eab..5b70dba3fd 100644
--- a/testing/xpcshell/xpcshellcommandline.py
+++ b/testing/xpcshell/xpcshellcommandline.py
@@ -23,6 +23,20 @@ def add_common_arguments(parser):
         help="application directory (as opposed to XRE directory)",
     )
     parser.add_argument(
+        "--msix-app-path",
+        type=str,
+        dest="msixAppPath",
+        default=None,
+        help="application directory for msix mode (as opposed to XRE directory)",
+    )
+    parser.add_argument(
+        "--msix-app-binary",
+        type=str,
+        dest="msix_app_binary",
+        default=None,
+        help="path to application binary for msix mode (eg: c:\\program files\\mozilla firefox\\firefox.exe)",
+    )
+    parser.add_argument(
         "--interactive",
         action="store_true",
         dest="interactive",
@@ -143,6 +157,15 @@ def add_common_arguments(parser):
         help="absolute path to directory containing XRE (probably xulrunner)",
     )
     parser.add_argument(
+        "--msix-xre-path",
+        action="store",
+        type=str,
+        dest="msixXrePath",
+        # individual scripts will set a sane default
+        default=None,
+        help="absolute path to directory containing XRE in msix mode (probably xulrunner)",
+    )
+    parser.add_argument(
         "--symbols-path",
         action="store",
         type=str,
@@ -248,6 +271,12 @@ def add_common_arguments(parser):
         "and CPU x 4 when running in automation",
     )
     parser.add_argument(
+        "--variant",
+        action="store",
+        default="",
+        help="use specified variant for any harness level changes.",
+    )
+    parser.add_argument(
         "--setpref",
         action="append",
         dest="extraPrefs",