Update nss_tests with some of the new gtests from upstream

- upstream added ssl_gtests, pk11_gtests, der_gtests, and util_gtests
- added p11_gtests and der_gtests but couldn't add ssl_gtests or util_gtests
- util_gtests statically links with libnssutil.a which isn't available in our tree
- util_gtests also links statically with sectool.a to access private exports
- some ssl_gtests are failing whose cause hasn't been determined yet
- TODO: investigate with upstream and try possible fixes on Rawhide first
This commit is contained in:
Elio Maldonado 2016-05-29 20:54:20 -07:00
parent 9bb2cf3374
commit 996e173db6
2 changed files with 9 additions and 6 deletions

View File

@ -1,6 +1,6 @@
diff -up ./nss/external_tests/manifest.mn.skip_util_gtest ./nss/external_tests/manifest.mn
--- ./nss/external_tests/manifest.mn.skip_util_gtest 2016-05-21 21:34:56.156346633 -0700
+++ ./nss/external_tests/manifest.mn 2016-05-21 21:35:23.408854282 -0700
diff -up ./external_tests/manifest.mn.skip_util_gtest ./external_tests/manifest.mn
--- ./external_tests/manifest.mn.skip_util_gtest 2016-05-21 21:34:56.156346633 -0700
+++ ./external_tests/manifest.mn 2016-05-21 21:35:23.408854282 -0700
@@ -8,7 +8,6 @@ DEPTH = ..
DIRS = \
google_test \

View File

@ -21,7 +21,7 @@ Name: nss
Version: 3.24.0
# for Rawhide, please always use release >= 2
# for Fedora release branches, please use release < 2 (1.0, 1.1, ...)
Release: 1.0%{?dist}
Release: 1.1%{?dist}
License: MPLv2.0
URL: http://www.mozilla.org/projects/security/pki/nss/
Group: System Environment/Libraries
@ -183,8 +183,8 @@ low level services.
%patch58 -p0 -b .1185708_3des
pushd nss
%patch60 -p1 -b .unitialized_vars
popd
%patch61 -p0 -b .skip_util_gtest
popd
#########################################################
# Higher-level libraries and test tools need access to
@ -446,7 +446,7 @@ pushd ./nss/tests/
# don't need to run all the tests when testing packaging
# nss_cycles: standard pkix upgradedb sharedb
%define nss_tests "libpkix cert dbtests tools fips sdr crmf smime ssl ocsp merge pkits chains"
%define nss_tests "libpkix cert dbtests tools fips sdr crmf smime ssl ocsp merge pkits chains pk11_gtests der_gtests"
# nss_ssl_tests: crl bypass_normal normal_bypass normal_fips fips_normal iopr
# nss_ssl_run: cov auth stress
#
@ -793,6 +793,9 @@ fi
%changelog
* Mon May 30 2016 Elio Maldonado <emaldona@redhat.com> - 3.24.0-1.1
- Update nss_tests with some of the new gtests from upstream
* Fri May 27 2016 Elio Maldonado <emaldona@redhat.com> - 3.24.0-1.0
- Rebase to NSS 3.24.0