diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:43:14 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:43:14 +0000 |
commit | 8dd16259287f58f9273002717ec4d27e97127719 (patch) | |
tree | 3863e62a53829a84037444beab3abd4ed9dfc7d0 /testing/xpcshell/runxpcshelltests.py | |
parent | Releasing progress-linux version 126.0.1-1~progress7.99u1. (diff) | |
download | firefox-8dd16259287f58f9273002717ec4d27e97127719.tar.xz firefox-8dd16259287f58f9273002717ec4d27e97127719.zip |
Merging upstream version 127.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'testing/xpcshell/runxpcshelltests.py')
-rwxr-xr-x | testing/xpcshell/runxpcshelltests.py | 13 |
1 files changed, 10 insertions, 3 deletions
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 |