[nss-softokn/f21] - Update to nss-3.17.1 - Add a mechanism to skip test suite execution during development work - Upda
Kai Engert
kengert at fedoraproject.org
Wed Sep 24 23:25:46 UTC 2014
commit d004fdecfe41db1a564660fe76e667894977a92a
Author: Kai Engert <kaie at redhat.com>
Date: Thu Sep 25 01:25:26 2014 +0200
- Update to nss-3.17.1
- Add a mechanism to skip test suite execution during development work
- Update nss-util build dependency
- Fix check of test suite result
.gitignore | 2 +-
nss-softokn.spec | 29 +++++++++++++++++++++++------
sources | 2 +-
3 files changed, 25 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3bb6de0..920083d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/nss-softokn-3.17.0.tar.gz
+/nss-softokn-3.17.1.tar.gz
diff --git a/nss-softokn.spec b/nss-softokn.spec
index 7391613..097dd71 100644
--- a/nss-softokn.spec
+++ b/nss-softokn.spec
@@ -1,6 +1,6 @@
%global nspr_version 4.10.7
%global nss_name nss
-%global nss_util_version 3.17.0
+%global nss_util_version 3.17.1
%global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
%global saved_files_dir %{_libdir}/nss/saved
@@ -24,8 +24,8 @@
Summary: Network Security Services Softoken Module
Name: nss-softokn
-Version: 3.17.0
-Release: 1%{?dist}
+Version: 3.17.1
+Release: 2%{?dist}
License: MPLv2.0
URL: http://www.mozilla.org/projects/security/pki/nss/
Group: System Environment/Libraries
@@ -269,11 +269,20 @@ cd ./nss/tests/
%global nss_ssl_tests " "
%global nss_ssl_run " "
-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
+SKIP_NSS_TEST_SUITE=`echo $SKIP_NSS_TEST_SUITE`
-cd ../../../../
+if [ "x$SKIP_NSS_TEST_SUITE" == "x" ]; then
+ 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
+fi
+
+cd ../..
+
+if [ "x$SKIP_NSS_TEST_SUITE" == "x" ]; then
+ TEST_FAILURES=`grep -c FAILED ./tests_results/security/localhost.1/output.log` || :
+else
+ TEST_FAILURES=0
+fi
-TEST_FAILURES=`grep -c FAILED ./tests_results/security/localhost.1/output.log` || :
if [ $TEST_FAILURES -ne 0 ]; then
echo "error: test suite returned failure(s)"
exit 1
@@ -385,6 +394,14 @@ done
%{_includedir}/nss3/shsign.h
%changelog
+* Wed Sep 24 2014 Kai Engert <kaie at redhat.com> - 3.17.1-2
+- Update nss-util build dependency
+- Fix check of test suite result
+
+* Wed Sep 24 2014 Kai Engert <kaie at redhat.com> - 3.17.1-1
+- Update to nss-3.17.1
+- Add a mechanism to skip test suite execution during development work
+
* Tue Aug 19 2014 Elio Maldonado <emaldona at redhat.com> - 3.17.0-1
- Update to nss-3.17.0
diff --git a/sources b/sources
index 8abd68b..79ddc8b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bcb380981f87bbb1f01fbb881003037e nss-softokn-3.17.0.tar.gz
+e188fa6c125989b35d47226ccc411d49 nss-softokn-3.17.1.tar.gz
More information about the scm-commits
mailing list