SpiderMonkey tests do not fail on any arch

Basic JIT tests are failing on s390 arches, only
Use macro for ppc64 arches
Run tests using Python2 explicitly
Simplify %%check
Use the %%{major} macro consequently
Replace %%define with %%global
This commit is contained in:
Björn Esser 2017-11-24 09:23:07 +01:00
parent 6298956443
commit fc72936fd3
No known key found for this signature in database
GPG Key ID: F52E98007594C21D
1 changed files with 24 additions and 18 deletions

View File

@ -2,12 +2,12 @@
# Big endian platforms
%ifarch ppc ppc64 s390 s390x
%define big_endian 1
%global big_endian 1
%endif
Name: mozjs%{major}
Version: 52.5.0
Release: 2%{?dist}
Version: %{major}.5.0
Release: 3%{?dist}
Summary: SpiderMonkey JavaScript library
License: MPLv2.0 and MPLv1.1 and BSD and GPLv2+ and GPLv3+ and LGPLv2.1 and LGPLv2.1+ and AFL and ASL 2.0
@ -100,7 +100,7 @@ autoconf-2.13
%ifarch s390 s390x
--disable-jemalloc \
%endif
%ifarch %{arm} aarch64 ppc ppc64 ppc64le
%ifarch %{arm} aarch64 ppc %{power64}
--disable-ion
%endif
@ -122,28 +122,25 @@ popd
chmod -x %{buildroot}%{_libdir}/pkgconfig/*.pc
# Remove unneeded files
rm %{buildroot}%{_bindir}/js52-config
rm %{buildroot}%{_bindir}/js%{major}-config
rm %{buildroot}%{_libdir}/libjs_static.ajs
# Rename library and create symlinks, following fix-soname.patch
mv %{buildroot}%{_libdir}/libmozjs-52.so \
%{buildroot}%{_libdir}/libmozjs-52.so.0.0.0
ln -s libmozjs-52.so.0.0.0 %{buildroot}%{_libdir}/libmozjs-52.so.0
ln -s libmozjs-52.so.0 %{buildroot}%{_libdir}/libmozjs-52.so
mv %{buildroot}%{_libdir}/libmozjs-%{major}.so \
%{buildroot}%{_libdir}/libmozjs-%{major}.so.0.0.0
ln -s libmozjs-%{major}.so.0.0.0 %{buildroot}%{_libdir}/libmozjs-%{major}.so.0
ln -s libmozjs-%{major}.so.0 %{buildroot}%{_libdir}/libmozjs-%{major}.so
%check
# Run SpiderMonkey tests
%ifarch %{ix86} x86_64 %{arm} aarch64
tests/jstests.py -d -s -t 1800 --no-progress ../../js/src/js/src/shell/js
%else
tests/jstests.py -d -s -t 1800 --no-progress ../../js/src/js/src/shell/js || :
%endif
%{__python2} tests/jstests.py -d -s -t 1800 --no-progress ../../js/src/js/src/shell/js
# Run basic JIT tests
%ifarch %{ix86} x86_64 %{arm} aarch64
jit-test/jit_test.py -s -t 1800 --no-progress ../../js/src/js/src/shell/js basic
%{__python2} jit-test/jit_test.py -s -t 1800 --no-progress ../../js/src/js/src/shell/js basic \
%ifnarch s390 s390x
;
%else
jit-test/jit_test.py -s -t 1800 --no-progress ../../js/src/js/src/shell/js basic || :
|| :
%endif
%post -p /sbin/ldconfig
@ -154,12 +151,21 @@ jit-test/jit_test.py -s -t 1800 --no-progress ../../js/src/js/src/shell/js basic
%{_libdir}/libmozjs-%{major}.so.0*
%files devel
%{_bindir}/js52
%{_bindir}/js%{major}
%{_libdir}/libmozjs-%{major}.so
%{_libdir}/pkgconfig/*.pc
%{_includedir}/mozjs-%{major}/
%changelog
* Fri Nov 24 2017 Björn Esser <besser82@fedoraproject.org> - 52.5.0-3
- SpiderMonkey tests do not fail on any arch
- Basic JIT tests are failing on s390 arches, only
- Use macro for ppc64 arches
- Run tests using Python2 explicitly
- Simplify %%check
- Use the %%{major} macro consequently
- Replace %%define with %%global
* Fri Nov 24 2017 Björn Esser <besser82@fedoraproject.org> - 52.5.0-2
- Use macro for Python 2 interpreter
- Use proper export and quoting