The package rpms/mozjs68.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/mozjs68.git/commit/?id=853b5800591a4....
Change: -%ifarch s390x s390
Thanks.
Full change: ============
commit 853b5800591a4aec1ca3a7a991803b2f64f5037e Author: František Zatloukal fzatlouk@redhat.com Date: Mon Aug 24 15:52:11 2020 +0200
Release 68.12.0
diff --git a/.gitignore b/.gitignore index e1cc249..e2f321f 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /firefox-68.9.0esr.source.tar.xz /firefox-68.10.0esr.source.tar.xz /firefox-68.11.0esr.source.tar.xz +/firefox-68.12.0esr.source.tar.xz diff --git a/Don-t-run-non262-extensions-clone-errors.js-on-s390x.patch b/Don-t-run-non262-extensions-clone-errors.js-on-s390x.patch deleted file mode 100644 index f493643..0000000 --- a/Don-t-run-non262-extensions-clone-errors.js-on-s390x.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: firefox-68.5.0/js/src/tests/jstests.list -=================================================================== ---- firefox-68.0/js/src/tests/jstests.list -+++ firefox-68.0/js/src/tests/jstests.list -@@ -493,6 +493,10 @@ skip script test262/language/expressions - skip script test262/language/statements/class/elements/derived-cls-direct-eval-err-contains-superproperty-1.js - skip script test262/language/statements/class/elements/derived-cls-direct-eval-err-contains-superproperty-2.js - -+# Crashes on s390x and ppc64, avoid it -+# -+skip-if(xulRuntime.XPCOMABI.match(/s390x|ppc64-/)) script non262/extensions/clone-errors.js -+ - - ########################################################### - # Tests disabled due to issues in test262 importer script # diff --git a/Exclude-failing-tests-on-s390x.patch b/Exclude-failing-tests-on-s390x.patch new file mode 100644 index 0000000..064f868 --- /dev/null +++ b/Exclude-failing-tests-on-s390x.patch @@ -0,0 +1,29 @@ +From b9e1976edca1af828a219d5ac35d07202170e5ba Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= fzatlouk@redhat.com +Date: Mon, 24 Aug 2020 15:45:36 +0200 +Subject: [PATCH] Exclude failing tests on s390x + +--- + js/src/tests/jstests.list | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/js/src/tests/jstests.list b/js/src/tests/jstests.list +index 8f5c0df..75f80f8 100644 +--- a/js/src/tests/jstests.list ++++ b/js/src/tests/jstests.list +@@ -493,6 +493,12 @@ skip script test262/language/expressions/class/elements/derived-cls-direct-eval- + skip script test262/language/statements/class/elements/derived-cls-direct-eval-err-contains-superproperty-1.js + skip script test262/language/statements/class/elements/derived-cls-direct-eval-err-contains-superproperty-2.js + ++# Crashes on s390x and ppc64, avoid it ++skip-if(xulRuntime.XPCOMABI.match(/s390x|ppc64-/)) script non262/extensions/clone-errors.js ++ ++# Crashes on s390x ++skip-if(xulRuntime.XPCOMABI.match(/s390x/)) script test262/built-ins/TypedArray/prototype/set/typedarray-arg-set-values-same-buffer-other-type.js ++skip-if(xulRuntime.XPCOMABI.match(/s390x/)) script non262/Intl/DateTimeFormat/timeZone_backward_links.js + + ########################################################### + # Tests disabled due to issues in test262 importer script # +-- +2.26.2 + diff --git a/mozjs68.spec b/mozjs68.spec index 88fc66a..99af3ed 100644 --- a/mozjs68.spec +++ b/mozjs68.spec @@ -6,11 +6,6 @@ # Require tests to pass? %global require_tests 1
-# typedarray-arg-set-values-same-buffer-other-type.js is failing on s390x -%ifarch s390x s390 -%global require_tests 0 -%endif - %if 0%{?build_with_lto} %global optflags %{optflags} -flto %global build_ldflags %{build_ldflags} -flto @@ -27,7 +22,7 @@ %endif
Name: mozjs%{major} -Version: 68.11.0 +Version: 68.12.0 Release: 1%{?dist} Summary: SpiderMonkey JavaScript library
@@ -57,7 +52,7 @@ Patch17: armv7_disable_WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS.patch
# s390x fixes, TODO: file bug report upstream? Patch18: spidermonkey_style_check_disable_s390x.patch -Patch19: Don-t-run-non262-extensions-clone-errors.js-on-s390x.patch +Patch19: Exclude-failing-tests-on-s390x.patch
# Patches from Fedora firefox package: Patch26: build-icu-big-endian.patch @@ -76,6 +71,7 @@ BuildRequires: pkgconfig(zlib) # Build requires Python 2, tests are patched to run with Python 3 BuildRequires: python2-devel BuildRequires: python3-devel +BuildRequires: python3-setuptools BuildRequires: python3-six BuildRequires: readline-devel BuildRequires: zip @@ -261,6 +257,10 @@ PYTHONPATH=tests/lib %{__python3} jit-test/jit_test.py -s -t 1800 --no-progress %{_includedir}/mozjs-%{major}/
%changelog +* Mon Aug 24 2020 Frantisek Zatloukal fzatlouk@redhat.com - 68.12.0-1 +- Update to 68.12.0 +- Force tests to pass even on s390x, disable the failing ones + * Fri Jul 31 2020 Frantisek Zatloukal fzatlouk@redhat.com - 68.11.0-1 - Update to 68.11.0
diff --git a/sources b/sources index 6d1dd5e..ca61a0b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (firefox-68.11.0esr.source.tar.xz) = 7dcfa4944945bce184b96643a7afbd0cc97c93e4f727695bd5ee1e1745cff89784e68baf109588ef56791211b4b8f5c7c056ae6ac77f54fd00a5af5d5606f23e +SHA512 (firefox-68.12.0esr.source.tar.xz) = 839b02422e4c87bdb12e0995cd35ca8c1996f3fba00bbb46b419e46b67df5ec48a264cb14632db777ce29166ee4fdcb06e2ee3ce847e64328c58c9a2f9129f4c