Enable tests on s390x again

This adds two more Debian patches to fix issues with tests on s390x.
This commit is contained in:
Kalev Lember 2020-02-17 13:41:47 +01:00
parent 4bdd99ed97
commit 2722d5b430
3 changed files with 49 additions and 2 deletions

View File

@ -42,6 +42,10 @@ Patch14: init_patch.patch
Patch15: enddianness.patch
# https://salsa.debian.org/gnome-team/mozjs60/blob/debian/master/debian/patches/jsproperty-endian.patch
Patch16: jsproperty-endian.patch
# https://salsa.debian.org/gnome-team/mozjs60/blob/debian/master/debian/patches/tests-Skip-a-test-on-s390x.patch
Patch17: tests-Skip-a-test-on-s390x.patch
# https://salsa.debian.org/gnome-team/mozjs60/blob/debian/master/debian/patches/tests-Expect-a-test-to-fail-on-big-endian.patch
Patch18: tests-Expect-a-test-to-fail-on-big-endian.patch
# Patches from Fedora firefox package:
Patch26: build-icu-big-endian.patch
@ -98,6 +102,8 @@ pushd ../..
# s390x fixes
%patch15 -p1
%patch16 -p1
%patch17 -p1
%patch18 -p1
# Patch for big endian platforms only
%if 0%{?big_endian}
@ -210,7 +216,7 @@ ln -s libmozjs-%{major}.so.0 %{buildroot}%{_libdir}/libmozjs-%{major}.so
%check
# Run SpiderMonkey tests
%{__python2} tests/jstests.py -d -s -t 1800 --no-progress ../../js/src/js/src/shell/js \
%ifarch %{ix86} x86_64 %{arm} aarch64 ppc ppc64le
%ifarch %{ix86} x86_64 %{arm} aarch64 ppc ppc64le s390x
;
%else
|| :
@ -218,7 +224,7 @@ ln -s libmozjs-%{major}.so.0 %{buildroot}%{_libdir}/libmozjs-%{major}.so
# Run basic JIT tests
%{__python2} jit-test/jit_test.py -s -t 1800 --no-progress ../../js/src/js/src/shell/js basic \
%ifarch %{ix86} x86_64 %{arm} aarch64 ppc ppc64le
%ifarch %{ix86} x86_64 %{arm} aarch64 ppc ppc64le s390x
;
%else
|| :
@ -239,6 +245,7 @@ ln -s libmozjs-%{major}.so.0 %{buildroot}%{_libdir}/libmozjs-%{major}.so
%changelog
* Mon Feb 17 2020 Kalev Lember <klember@redhat.com> - 60.9.0-5
- Update enddianness.patch with more s390x fixes
- Enable tests on s390x again
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 60.9.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

View File

@ -0,0 +1,24 @@
From: Simon McVittie <smcv@debian.org>
Date: Fri, 28 Sep 2018 09:51:33 +0100
Subject: tests: Expect a test to fail on big-endian
Signed-off-by: Simon McVittie <smcv@debian.org>
Forwarded: no
---
js/src/tests/jstests.list | 3 +++
1 file changed, 3 insertions(+)
Index: firefox-60.9.0/js/src/tests/jstests.list
===================================================================
--- firefox-60.9.0.orig/js/src/tests/jstests.list 2019-12-10 11:04:22.464247245 +0100
+++ firefox-60.9.0/js/src/tests/jstests.list 2019-12-10 11:15:21.496264080 +0100
@@ -451,6 +451,8 @@
#
skip-if(xulRuntime.XPCOMABI.match(/s390x|ppc64-/)) script non262/extensions/clone-errors.js
+# Assumes little-endian IEEE representation of floating point numbers
+fails-if(xulRuntime.XPCOMABI.match(/s390x|ppc64-|ppc-/)) script test262/built-ins/TypedArray/prototype/set/typedarray-arg-set-values-same-buffer-other-type.js
###########################################################
# Tests disabled due to issues in test262 importer script #

View File

@ -0,0 +1,16 @@
Index: firefox-60.9.0/js/src/tests/jstests.list
===================================================================
--- firefox-60.9.0.orig/js/src/tests/jstests.list 2019-12-10 11:03:40.064246162 +0100
+++ firefox-60.9.0/js/src/tests/jstests.list 2019-12-10 11:04:22.464247245 +0100
@@ -447,6 +447,10 @@
# https://bugzilla.mozilla.org/show_bug.cgi?id=1321616
skip script test262/annexB/built-ins/Function/createdynfn-html-close-comment-params.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 #