Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-20 00:35:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 8984a7d5601f (bug 1594851) for spidermonkey bustage. CLOSED TREE

Browse Source
This commit is contained in:
Csoregi Natalia 2020-01-29 07:56:24 +02:00
parent 73acd23b46
commit fa1de91185
2 changed files with 12 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
js/src/devtools/automation/autospider.py
View File

@ -224,19 +224,6 @@ elif platform.system() == 'Windows':
else:
compiler = 'gcc'
# Need a platform name to use as a key in variant files.
if args.platform:
variant_platform = args.platform.split("-")[0]
elif platform.system() == 'Windows':
variant_platform = 'win64' if word_bits == 64 else 'win32'
elif platform.system() == 'Linux':
variant_platform = 'linux64' if word_bits == 64 else 'linux'
elif platform.system() == 'Darwin':
variant_platform = 'macosx64'
else:
variant_platform = 'other'
info("using compiler '{}'".format(compiler))
cxx = {'clang': 'clang++', 'gcc': 'g++', 'cl': 'cl'}.get(compiler)
@ -307,12 +294,6 @@ else:
if platform.system() == 'Linux' and AUTOMATION:
CONFIGURE_ARGS = '--enable-stdcxx-compat --disable-gold ' + CONFIGURE_ARGS
# Override environment variant settings conditionally.
CONFIGURE_ARGS = "{} {}".format(
variant.get('conditional-configure-args', {}).get(variant_platform, ''),
CONFIGURE_ARGS
)
# Timeouts.
ACTIVE_PROCESSES = set()
@ -467,6 +448,18 @@ def normalize_tests(tests):
return tests
# Need a platform name to use as a key in variant files.
if args.platform:
variant_platform = args.platform.split("-")[0]
elif platform.system() == 'Windows':
variant_platform = 'win64' if word_bits == 64 else 'win32'
elif platform.system() == 'Linux':
variant_platform = 'linux64' if word_bits == 64 else 'linux'
elif platform.system() == 'Darwin':
variant_platform = 'macosx64'
else:
variant_platform = 'other'
# Override environment variant settings conditionally.
for k, v in variant.get('conditional-env', {}).get(variant_platform, {}).items():
env[k] = v.format(**REPLACEMENTS)

4
js/src/devtools/automation/variants/plain
View File

@ -1,7 +1,6 @@
{
"configure-args": "--enable-rust-simd",
"optimize": true,
"compiler": "clang",
"env": {
"JSTESTS_EXTRA_ARGS": "--jitflags=jstests"
},
@ -9,8 +8,5 @@
"linux64": {
"JITTEST_EXTRA_ARGS": "--run-binast"
}
},
"conditional-configure-args": {
"linux64": "--enable-clang-plugin"
}
}