Backed out changeset 699842251977 (bug 1401319) for spidermonkey arm bustage. r=backout
authorSebastian Hengst <archaeopteryx@coole-files.de>
Wed, 20 Sep 2017 19:06:19 +0200
changeset 431452 440965fa9a236c5d4ac69c84c6080a4be75fc0ab
parent 431451 e3835d35a46ed3450b2b99eccc1045f9c9022fbe
child 431453 5e070a86daad50fa6ea1902f86bf9d29fad390bf
push id7784
push userryanvm@gmail.com
push dateThu, 21 Sep 2017 00:40:13 +0000
treeherdermozilla-beta@efff4f307675 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1401319
milestone57.0a1
backs out6998422519778a38cfde7e901d05919fde0b023b
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 699842251977 (bug 1401319) for spidermonkey arm bustage. r=backout
js/src/tests/js1_5/Array/regress-157652.js
js/src/tests/js1_5/Regress/regress-422348.js
js/src/tests/lib/manifest.py
--- a/js/src/tests/js1_5/Array/regress-157652.js
+++ b/js/src/tests/js1_5/Array/regress-157652.js
@@ -1,9 +1,9 @@
-// |reftest| skip-if(xulRuntime.is64Bit||Android) -- No test results
+// |reftest| skip-if(xulRuntime.XPCOMABI.match(/x86_64|aarch64|ppc64|ppc64le|s390x/)||Android) -- No test results
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /*
  *
  * Date:    16 July 2002
--- a/js/src/tests/js1_5/Regress/regress-422348.js
+++ b/js/src/tests/js1_5/Regress/regress-422348.js
@@ -1,9 +1,9 @@
-// |reftest| skip-if(xulRuntime.is64Bit) -- On 64-bit, takes forever rather than throwing
+// |reftest| skip-if(xulRuntime.XPCOMABI.match(/x86_64|aarch64|ppc64|ppc64le|s390x/)) -- On 64-bit, takes forever rather than throwing
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 422348;
 var summary = 'Proper overflow error reporting';
--- a/js/src/tests/lib/manifest.py
+++ b/js/src/tests/lib/manifest.py
@@ -16,33 +16,31 @@ def split_path_into_dirs(path):
     while True:
         path, tail = os.path.split(path)
         if not tail:
             break
         dirs.append(path)
     return dirs
 
 class XULInfo:
-    def __init__(self, abi, os, is64Bit, isdebug):
+    def __init__(self, abi, os, isdebug):
         self.abi = abi
         self.os = os
-        self.is64Bit = is64Bit
         self.isdebug = isdebug
         self.browserIsRemote = False
 
     def as_js(self):
         """Return JS that when executed sets up variables so that JS expression
         predicates on XUL build info evaluate properly."""
 
-        return ('var xulRuntime = {{ OS: "{}", is64Bit: {}, XPCOMABI: "{}", shell: true }};'
+        return ('var xulRuntime = {{ OS: "{}", XPCOMABI: "{}", shell: true }};'
                 'var release_or_beta = getBuildConfiguration().release_or_beta;'
                 'var isDebugBuild={}; var Android={}; '
                 'var browserIsRemote={}'.format(
                     self.os,
-                    "true" if self.is64Bit else "false",
                     self.abi,
                     str(self.isdebug).lower(),
                     str(self.os == "Android").lower(),
                     str(self.browserIsRemote).lower()))
 
     @classmethod
     def create(cls, jsdir):
         """Create a XULInfo based on the current platform's characteristics."""
@@ -61,29 +59,27 @@ class XULInfo:
                 break
 
         if path == None:
             print("Can't find config/autoconf.mk on a directory containing"
                   " the JS shell (searched from {})".format(jsdir))
             sys.exit(1)
 
         # Read the values.
-        val_re = re.compile(r'(TARGET_XPCOM_ABI|OS_TARGET|MOZ_DEBUG|HAVE_64BIT_BUILD)\s*=\s*(.*)')
+        val_re = re.compile(r'(TARGET_XPCOM_ABI|OS_TARGET|MOZ_DEBUG)\s*=\s*(.*)')
         kw = {'isdebug': False}
         for line in open(path):
             m = val_re.match(line)
             if m:
                 key, val = m.groups()
                 val = val.rstrip()
                 if key == 'TARGET_XPCOM_ABI':
                     kw['abi'] = val
                 if key == 'OS_TARGET':
                     kw['os'] = val
-                if key == 'HAVE_64BIT_BUILD':
-                    kw['is64Bit'] = (val == '1')
                 if key == 'MOZ_DEBUG':
                     kw['isdebug'] = (val == '1')
         return cls(**kw)
 
 class XULInfoTester:
     def __init__(self, xulinfo, js_bin):
         self.js_prologue = xulinfo.as_js()
         self.js_bin = js_bin