From: Jan Palus Date: Tue, 2 Jun 2020 17:36:26 +0000 (+0200) Subject: disable building unit tests by default X-Git-Tag: auto/th/nss-3.53-1 X-Git-Url: https://git.pld-linux.org/?p=packages%2Fnss.git;a=commitdiff_plain;h=ec49a08 disable building unit tests by default tests are not executed anyway and readme claims: "**Runnning all tests will take a while!**" --- diff --git a/nss.spec b/nss.spec index 91de456..8254ad5 100644 --- a/nss.spec +++ b/nss.spec @@ -1,3 +1,6 @@ +# Conditional build: +%bcond_with tests # enable tests + %define nspr_ver 1:4.25 %define foover %(echo %{version} | tr . _) Summary: NSS - Network Security Services @@ -133,6 +136,7 @@ export ZLIB_LIBS="-lz" %ifarch x32 export USE_X32=1 %endif +%{!?with_tests:export NSS_DISABLE_GTESTS=1} # https://bugzilla.mozilla.org/show_bug.cgi?id=1084623 @@ -211,15 +215,18 @@ ln -s /%{_lib}/libfreeblpriv3.chk $RPM_BUILD_ROOT%{_libdir}/libfreeblpriv3.chk %{__mv} $RPM_BUILD_ROOT%{_libdir}/libssl{,3}.a # unit tests +%if %{with tests} %{__rm} $RPM_BUILD_ROOT%{_bindir}/{certdb,certhigh,cryptohi,der,pk11,softoken,smime,ssl,util}_gtest -%{__rm} $RPM_BUILD_ROOT%{_bindir}/fbectest %{__rm} $RPM_BUILD_ROOT%{_bindir}/nss_bogo_shim +%{__rm} $RPM_BUILD_ROOT%{_libdir}/libgtest* +%{__rm} $RPM_BUILD_ROOT%{_libdir}/libpkcs11testmodule.* +%{__rm} $RPM_BUILD_ROOT%{_libdir}/libcpputil.* +%endif +%{__rm} $RPM_BUILD_ROOT%{_bindir}/fbectest %{__rm} $RPM_BUILD_ROOT%{_bindir}/pk11ectest %{__rm} $RPM_BUILD_ROOT%{_bindir}/pk11importtest %{__rm} $RPM_BUILD_ROOT%{_bindir}/rsapoptst -%{__rm} $RPM_BUILD_ROOT%{_libdir}/libgtest* %{__rm} $RPM_BUILD_ROOT%{_libdir}/libnss*-testlib.so -%{__rm} $RPM_BUILD_ROOT%{_libdir}/libpkcs11testmodule.* if [ ! -f "$RPM_BUILD_ROOT%{_includedir}/nss/nsslowhash.h" ]; then echo >&2 "ERROR: %{_includedir}/nss/nsslowhash.h not installed. Needed by glibc" @@ -253,7 +260,6 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/nss-config -%{_libdir}/libcpputil.a %{_libdir}/libcrmf.a %{_libdir}/libfreebl.a %{_includedir}/nss