Attachment 698646 Details for Bug 737704 – Fix typo and add check section to run the test suites

[patch] Fix typo and add check section to run the test suites

fix-typo-and-enable-testing.patch (text/plain), 2.94 KB, created by Elio Maldonado Batiz on 2013-02-17 22:51:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Elio Maldonado Batiz

Created: 2013-02-17 22:51:04 UTC

Size: 2.94 KB

patch

obsolete

>diff --git a/nss.spec b/nss.spec
>index dcf20b2..92a6ff4 100644
>--- a/nss.spec
>+++ b/nss.spec
>@@ -5,7 +5,7 @@
> Summary:          Network Security Services
> Name:             nss
> Version:          3.13.6
>-Release:          2%{?dist}
>+Release:          3%{?dist}
> License:          MPLv1.1 or GPLv2+ or LGPLv2+
> URL:              http://www.mozilla.org/projects/security/pki/nss/
> Group:            System Environment/Libraries
>@@ -199,6 +199,10 @@ cd ..
> BUILD_OPT=1
> export BUILD_OPT
> 
>+# Uncomment to disable optimizations
>+#RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | sed -e 's/-O2/-O0/g'`
>+#export RPM_OPT_FLAGS
>+
> # Generate symbolic info for debuggers
> XCFLAGS=$RPM_OPT_FLAGS
> export XCFLAGS
>@@ -284,6 +288,18 @@ export NSS_VPATCH
> 
> chmod 755 ./mozilla/dist/pkgconfig/nss-config
> 
>+%check
>+
>+# Begin -- copied from the build section
>+BUILD_OPT=1
>+export BUILD_OPT
>+
>+%ifarch x86_64 ppc64 ia64 s390x sparc64
>+USE_64=1
>+export USE_64
>+%endif
>+# End -- copied from the build section
>+
> # enable the following line to force a test failure
> # find ./mozilla -name \*.chk | xargs rm -f
> 
>@@ -299,7 +315,7 @@ chmod 755 ./mozilla/dist/pkgconfig/nss-config
> # avoid weird quoting we'll require that no spaces are being used.
> 
> SPACEISBAD=`find ./mozilla/security/nss/tests | grep -c ' '` ||:
>-if [ SPACEISBAD -ne 0 ]; then
>+if [ $SPACEISBAD -ne 0 ]; then
>   echo "error: filenames containing space are not supported (xargs)"
>   exit 1
> fi
>@@ -323,11 +339,20 @@ rm -rf ./mozilla/tests_results
> cd ./mozilla/security/nss/tests/
> # all.sh is the test suite script
> 
>-# Disabling tests until we update to softokn 3.12.4
>-%global nss_cycles " "
>-%global nss_tests " "
>-%global nss_ssl_tests " "
>-%global nss_ssl_run " "
>+# Disabling cycles and tests until we update to softokn 3.12.9 or higher
>+#  nss_cycles: standard pkix upgradedb sharedb
>+#  pkix, upgradedb, and sharedb require softokn from 3.12 and higher
>+%global nss_cycles "standard"
>+#  nss_tests="cipher libpkix cert dbtests tools fips sdr crmf smime ssl merge pkits chains"
>+#  cipher, fips, and merge would require softokn from 3.12.x
>+%global nss_tests "libpkix cert dbtests sdr crmf smime ssl pkits chains"
>+#  nss_ssl_tests: crl bypass_normal normal_bypass normal_fips fips_normal iopr
>+#  nss_ssl_run: cov auth stress
>+
>+# Uncomment these lines if you need to temporarily
>+# disable the ssl test suites for faster test builds
>+# global nss_ssl_tests "normal_fips"
>+# global nss_ssl_run "cov auth"
> 
> HOST=localhost DOMSUF=localdomain PORT=$MYRAND NSS_CYCLES=%{?nss_cycles} NSS_TESTS=%{?nss_tests} NSS_SSL_TESTS=%{?nss_ssl_tests} NSS_SSL_RUN=%{?nss_ssl_run} ./all.sh
> 
>@@ -575,6 +600,10 @@ done
> 
> 
> %changelog
>+* Sun Feb 17 2013 Elio Maldonado <emaldona@redhat.com> - 3.13.6-3
>+- Resolves: rhbz#737704 - Typo in testing script and enable testing
>+- Add a check section to run a subset of the test suites
>+
> * Thu Jan 10 2013 Elio Maldonado <emaldona@redhat.com> - 3.13.6-2
> - Resolves: rhbz#891150 - Dis-trust TURKTRUST mis-issued *.google.com certificate
>

Flags:

rrelyea: review+

Actions: View | Diff

Attachments on bug 737704: 698646