From 8dd16259287f58f9273002717ec4d27e97127719 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 12 Jun 2024 07:43:14 +0200 Subject: Merging upstream version 127.0. Signed-off-by: Daniel Baumann --- testing/xpcshell/runxpcshelltests.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'testing/xpcshell/runxpcshelltests.py') 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 -- cgit v1.2.3