commit 277955440c5e4138a02149f255e34b5d6ed67763
parent 4555faba28f41e8588fcdcdb8388bffe221afa4d
Author: André Bargull <andre.bargull@gmail.com>
Date: Fri, 14 Nov 2025 14:16:13 +0000
Bug 1999948 - Part 1: Fix OS detection for XULInfo. r=spidermonkey-reviewers,jandem
Differential Revision: https://phabricator.services.mozilla.com/D272440
Diffstat:
1 file changed, 11 insertions(+), 15 deletions(-)
diff --git a/js/src/tests/lib/manifest.py b/js/src/tests/lib/manifest.py
@@ -33,21 +33,17 @@ class XULInfo:
"""Return JS that when executed sets up variables so that JS expression
predicates on XUL build info evaluate properly."""
- return (
- "var winWidget = {};"
- "var gtkWidget = {};"
- "var cocoaWidget = {};"
- "var is64Bit = {};"
- "var xulRuntime = {{ shell: true }};"
- "var release_or_beta = getBuildConfiguration('release_or_beta');"
- "var isDebugBuild={}; var Android={}; ".format(
- str(self.os == "WINNT").lower(),
- str(self.os == "Darwin").lower(),
- str(self.os == "Linux").lower(),
- str("x86-" not in self.abi).lower(),
- str(self.isdebug).lower(),
- str(self.os == "Android").lower(),
- )
+ return f"""
+var winWidget = {str(self.os == "WINNT").lower()};
+var gtkWidget = {str(self.os == "Linux").lower()};
+var cocoaWidget = {str(self.os == "Darwin").lower()};
+var is64Bit = {str("x86-" not in self.abi).lower()};
+var xulRuntime = {{ shell: true }};
+var release_or_beta = getBuildConfiguration('release_or_beta');
+var isDebugBuild={str(self.isdebug).lower()};
+var Android={str(self.os == "Android").lower()};
+""".replace(
+ "\n", ""
)
@classmethod