Merging upstream version 127.0.

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

1 files changed, 29 insertions, 0 deletions

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",