Accepting request 1090032 from mozilla:Factory
OBS-URL: https://build.opensuse.org/request/show/1090032 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mozilla-nss?expand=0&rev=201
This commit is contained in:
commit
535cae4fa1
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed May 31 12:54:20 UTC 2023 - Martin Sirringhaus <martin.sirringhaus@suse.com>
|
||||||
|
|
||||||
|
- Move testsuite to %check-section and move env-variables to
|
||||||
|
files for easier chroot-debugging
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Apr 10 21:31:33 UTC 2023 - Wolfgang Rosenauer <wr@rosenauer.org>
|
Mon Apr 10 21:31:33 UTC 2023 - Wolfgang Rosenauer <wr@rosenauer.org>
|
||||||
|
|
||||||
|
@ -249,18 +249,14 @@ cd nss
|
|||||||
%else
|
%else
|
||||||
%global _lto_cflags %{_lto_cflags} -ffat-lto-objects
|
%global _lto_cflags %{_lto_cflags} -ffat-lto-objects
|
||||||
%endif
|
%endif
|
||||||
|
cd nss
|
||||||
|
cat > ../obsenv.sh <<EOF
|
||||||
%if 0%{?sle_version} >= 120000 && 0%{?sle_version} < 150000
|
%if 0%{?sle_version} >= 120000 && 0%{?sle_version} < 150000
|
||||||
export CC=gcc-9
|
export CC=gcc-9
|
||||||
# Yes, they use both...
|
# Yes, they use both...
|
||||||
export CXX=g++-9
|
export CXX=g++-9
|
||||||
export CCC=g++-9
|
export CCC=g++-9
|
||||||
%endif
|
%endif
|
||||||
cd nss
|
|
||||||
modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{SOURCE99}")"
|
|
||||||
DATE="\"$(date -d "${modified}" "+%%b %%e %%Y")\""
|
|
||||||
TIME="\"$(date -d "${modified}" "+%%R")\""
|
|
||||||
find . -name '*.[ch]' -print -exec sed -i "s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g" {} +
|
|
||||||
|
|
||||||
export NSS_ALLOW_SSLKEYLOGFILE=1
|
export NSS_ALLOW_SSLKEYLOGFILE=1
|
||||||
export NSS_ENABLE_WERROR=0
|
export NSS_ENABLE_WERROR=0
|
||||||
export NSS_NO_PKCS11_BYPASS=1
|
export NSS_NO_PKCS11_BYPASS=1
|
||||||
@ -278,15 +274,31 @@ export NSS_USE_SYSTEM_SQLITE=1
|
|||||||
export NSS_ENABLE_FIPS_INDICATORS=1
|
export NSS_ENABLE_FIPS_INDICATORS=1
|
||||||
export NSS_FIPS_MODULE_ID="\"SUSE Linux Enterprise NSS %{version}-%{release}\""
|
export NSS_FIPS_MODULE_ID="\"SUSE Linux Enterprise NSS %{version}-%{release}\""
|
||||||
#export SQLITE_LIB_NAME=nsssqlite3
|
#export SQLITE_LIB_NAME=nsssqlite3
|
||||||
MAKE_FLAGS="BUILD_OPT=1"
|
export MAKE_FLAGS="BUILD_OPT=1"
|
||||||
|
EOF
|
||||||
|
|
||||||
|
source ../obsenv.sh
|
||||||
|
|
||||||
|
modified="$(sed -n '/^----/n;s/ - .*$//;p;q' "%{SOURCE99}")"
|
||||||
|
DATE="\"$(date -d "${modified}" "+%%b %%e %%Y")\""
|
||||||
|
TIME="\"$(date -d "${modified}" "+%%R")\""
|
||||||
|
find . -name '*.[ch]' -print -exec sed -i "s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g" {} +
|
||||||
|
|
||||||
make %{?_smp_mflags} nss_build_all $MAKE_FLAGS
|
make %{?_smp_mflags} nss_build_all $MAKE_FLAGS
|
||||||
|
|
||||||
|
%check
|
||||||
|
cd nss
|
||||||
# run testsuite
|
# run testsuite
|
||||||
%if 0%{?run_testsuite}
|
%if 0%{?run_testsuite}
|
||||||
|
cat > ../obstestenv.sh <<EOF
|
||||||
export BUILD_OPT=1
|
export BUILD_OPT=1
|
||||||
export HOST="localhost"
|
export HOST="localhost"
|
||||||
export DOMSUF="localdomain"
|
export DOMSUF="localdomain"
|
||||||
export USE_IP=TRUE
|
export USE_IP=TRUE
|
||||||
export IP_ADDRESS="127.0.0.1"
|
export IP_ADDRESS="127.0.0.1"
|
||||||
|
EOF
|
||||||
|
source ../obsenv.sh
|
||||||
|
source ../obstestenv.sh
|
||||||
cd tests
|
cd tests
|
||||||
./all.sh
|
./all.sh
|
||||||
if grep "FAILED" ../../../tests_results/security/localhost.1/output.log ; then
|
if grep "FAILED" ../../../tests_results/security/localhost.1/output.log ; then
|
||||||
|
Loading…
x
Reference in New Issue
Block a user