Module Name:    src
Committed By:   martin
Date:           Thu Feb 22 14:24:03 UTC 2018

Modified Files:
        src/distrib/sets/lists/tests: mi
        src/tests/crypto/libcrypto: Makefile t_hashes.sh t_libcrypto.sh

Log Message:
PR lib/53044: remove tests not provided by OpenSSL 1.1.x


To generate a diff of this commit:
cvs rdiff -u -r1.774 -r1.775 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.12 -r1.13 src/tests/crypto/libcrypto/Makefile
cvs rdiff -u -r1.2 -r1.3 src/tests/crypto/libcrypto/t_hashes.sh
cvs rdiff -u -r1.4 -r1.5 src/tests/crypto/libcrypto/t_libcrypto.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.774 src/distrib/sets/lists/tests/mi:1.775
--- src/distrib/sets/lists/tests/mi:1.774	Sun Feb 11 16:45:35 2018
+++ src/distrib/sets/lists/tests/mi	Thu Feb 22 14:24:03 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.774 2018/02/11 16:45:35 christos Exp $
+# $NetBSD: mi,v 1.775 2018/02/22 14:24:03 martin Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -1339,7 +1339,8 @@
 ./usr/tests/crypto/libcrypto/h_threadstest	tests-crypto-tests	compattestfile,atf
 ./usr/tests/crypto/libcrypto/h_x509v3test	comp-obsolete	openssl=11,obsolete
 ./usr/tests/crypto/libcrypto/h_x509v3test	tests-crypto-tests	compattestfile,atf,openssl=10
-./usr/tests/crypto/libcrypto/t_certs		tests-crypto-tests	compattestfile,atf
+./usr/tests/crypto/libcrypto/t_certs		comp-obsolete	openssl=11,obsolete
+./usr/tests/crypto/libcrypto/t_certs		tests-crypto-tests	compattestfile,atf,openssl=10
 ./usr/tests/crypto/libcrypto/t_ciphers		tests-crypto-tests	compattestfile,atf
 ./usr/tests/crypto/libcrypto/t_hashes		tests-crypto-tests	compattestfile,atf
 ./usr/tests/crypto/libcrypto/t_libcrypto	tests-crypto-tests	compattestfile,atf

Index: src/tests/crypto/libcrypto/Makefile
diff -u src/tests/crypto/libcrypto/Makefile:1.12 src/tests/crypto/libcrypto/Makefile:1.13
--- src/tests/crypto/libcrypto/Makefile:1.12	Thu Feb  8 21:59:10 2018
+++ src/tests/crypto/libcrypto/Makefile	Thu Feb 22 14:24:03 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2018/02/08 21:59:10 christos Exp $
+# $NetBSD: Makefile,v 1.13 2018/02/22 14:24:03 martin Exp $
 
 .include <bsd.own.mk>
 
@@ -14,7 +14,9 @@ SUBDIR += lhash sha x509v3
 
 TESTSDIR=	${TESTSBASE}/crypto/libcrypto
 
+.if ${HAVE_OPENSSL} == 10
 TESTS_SH=	t_certs
+.endif
 TESTS_SH+=	t_ciphers
 TESTS_SH+=	t_hashes
 TESTS_SH+=	t_libcrypto

Index: src/tests/crypto/libcrypto/t_hashes.sh
diff -u src/tests/crypto/libcrypto/t_hashes.sh:1.2 src/tests/crypto/libcrypto/t_hashes.sh:1.3
--- src/tests/crypto/libcrypto/t_hashes.sh:1.2	Sat Jul 14 16:04:06 2012
+++ src/tests/crypto/libcrypto/t_hashes.sh	Thu Feb 22 14:24:03 2018
@@ -1,4 +1,4 @@
-# $NetBSD: t_hashes.sh,v 1.2 2012/07/14 16:04:06 spz Exp $
+# $NetBSD: t_hashes.sh,v 1.3 2018/02/22 14:24:03 martin Exp $
 #
 # Copyright (c) 2008, 2009, 2010 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -103,6 +103,6 @@ atf_init_test_cases()
 	atf_add_test_case md4
 	atf_add_test_case md5
 	atf_add_test_case ripemd
-	atf_add_test_case sha
+	openssl version | fgrep -q "OpenSSL 1.0" && atf_add_test_case sha
 	atf_add_test_case mdc2
 }

Index: src/tests/crypto/libcrypto/t_libcrypto.sh
diff -u src/tests/crypto/libcrypto/t_libcrypto.sh:1.4 src/tests/crypto/libcrypto/t_libcrypto.sh:1.5
--- src/tests/crypto/libcrypto/t_libcrypto.sh:1.4	Thu Oct 13 09:25:37 2016
+++ src/tests/crypto/libcrypto/t_libcrypto.sh	Thu Feb 22 14:24:03 2018
@@ -1,4 +1,4 @@
-# $NetBSD: t_libcrypto.sh,v 1.4 2016/10/13 09:25:37 martin Exp $
+# $NetBSD: t_libcrypto.sh,v 1.5 2018/02/22 14:24:03 martin Exp $
 #
 # Copyright (c) 2008, 2009, 2010 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -102,6 +102,6 @@ atf_init_test_cases()
 	atf_add_test_case rand
 	atf_add_test_case bn
 	atf_add_test_case conf
-	atf_add_test_case lhash
+	openssl version | fgrep -q "OpenSSL 1.0" && atf_add_test_case lhash
 	atf_add_test_case threads
 }

Reply via email to