Backed out changeset 8984a7d5601f (bug 1594851) for spidermonkey bustage. CLOSED TREE
authorCsoregi Natalia <ncsoregi@mozilla.com>
Wed, 29 Jan 2020 07:56:24 +0200
changeset 512061 3a95f5e058f43b18d53697a8c2ca1ee4f875585d
parent 512060 8984a7d5601f782b5b006eeca8429b22adc39b9d
child 512062 b0b796714d254ecb33c7ec0b19ce79e113223a8d
push id106151
push userncsoregi@mozilla.com
push dateWed, 29 Jan 2020 05:57:06 +0000
treeherderautoland@3a95f5e058f4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1594851
milestone74.0a1
backs out8984a7d5601f782b5b006eeca8429b22adc39b9d
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 8984a7d5601f (bug 1594851) for spidermonkey bustage. CLOSED TREE
js/src/devtools/automation/autospider.py
js/src/devtools/automation/variants/plain
--- a/js/src/devtools/automation/autospider.py
+++ b/js/src/devtools/automation/autospider.py
@@ -219,29 +219,16 @@ if 'compiler' in variant:
     compiler = variant['compiler']
 elif platform.system() == 'Darwin':
     compiler = 'clang'
 elif platform.system() == 'Windows':
     compiler = 'cl'
 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)
 
 compiler_dir = env.get('GCCDIR', os.path.join(DIR.fetches, compiler))
 info("looking for compiler under {}/".format(compiler_dir))
 compiler_libdir = None
 if os.path.exists(os.path.join(compiler_dir, 'bin', compiler)):
@@ -302,22 +289,16 @@ if word_bits == 32:
         env['CXXFLAGS'] = '{0} {1}'.format(env.get('CXXFLAGS', ''), sse_flags)
 else:
     if platform.system() == 'Windows':
         CONFIGURE_ARGS += ' --target=x86_64-pc-mingw32'
 
 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()
 
 
 def killall():
     for proc in ACTIVE_PROCESSES:
         proc.kill()
     ACTIVE_PROCESSES.clear()
@@ -462,16 +443,28 @@ test_suites = set(default_test_suites)
 
 
 def normalize_tests(tests):
     if 'all' in tests:
         return default_test_suites
     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)
 
 # Skip any tests that are not run on this platform (or the 'all' platform).
 test_suites -= set(normalize_tests(variant.get('skip-tests', {}).get(variant_platform, [])))
 test_suites -= set(normalize_tests(variant.get('skip-tests', {}).get('all', [])))
 
--- a/js/src/devtools/automation/variants/plain
+++ b/js/src/devtools/automation/variants/plain
@@ -1,16 +1,12 @@
 {
     "configure-args": "--enable-rust-simd",
     "optimize": true,
-    "compiler": "clang",
     "env": {
         "JSTESTS_EXTRA_ARGS": "--jitflags=jstests"
     },
     "conditional-env": {
         "linux64": {
             "JITTEST_EXTRA_ARGS": "--run-binast"
         }
-    },
-    "conditional-configure-args": {
-        "linux64": "--enable-clang-plugin"
     }
 }