From 81532b11c7463a6a8116e0d60304bef085ff27d8 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Sun, 9 Jul 2017 21:05:00 -0400 Subject: [PATCH] Bug 1357593 - Skip JS tests on all 64-bit archs. r=sfink Tests that are skipped on x86_64 should be skipped on all 64-bit architectures. Taken from Fedora: http://pkgs.fedoraproject.org/cgit/rpms/mozjs38.git/tree/fix-64bit-archs.patch --HG-- extra : rebase_source : f30355a0671709b42fe84485895d9d82db68b67e --- js/src/tests/js1_5/Array/regress-157652.js | 2 +- js/src/tests/js1_5/Array/regress-330812.js | 2 +- js/src/tests/js1_5/Regress/regress-422348.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/js/src/tests/js1_5/Array/regress-157652.js b/js/src/tests/js1_5/Array/regress-157652.js index 7f1d4b12c57e..6916fe1790d4 100644 --- a/js/src/tests/js1_5/Array/regress-157652.js +++ b/js/src/tests/js1_5/Array/regress-157652.js @@ -1,4 +1,4 @@ -// |reftest| skip-if(xulRuntime.XPCOMABI.match(/x86_64/)||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 diff --git a/js/src/tests/js1_5/Array/regress-330812.js b/js/src/tests/js1_5/Array/regress-330812.js index 3a392976da03..c48f4c886ad5 100644 --- a/js/src/tests/js1_5/Array/regress-330812.js +++ b/js/src/tests/js1_5/Array/regress-330812.js @@ -1,4 +1,4 @@ -// |reftest| skip-if(xulRuntime.XPCOMABI.match(/x86_64/)||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 diff --git a/js/src/tests/js1_5/Regress/regress-422348.js b/js/src/tests/js1_5/Regress/regress-422348.js index f2443c28493c..7ae83f4a6c8e 100644 --- a/js/src/tests/js1_5/Regress/regress-422348.js +++ b/js/src/tests/js1_5/Regress/regress-422348.js @@ -1,4 +1,4 @@ -// |reftest| skip-if(xulRuntime.XPCOMABI.match(/x86_64/)) -- 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