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

This commit is contained in:
martin 2018-02-22 14:24:03 +00:00
parent 20bd55c3fb
commit 3cbaed46a2
4 changed files with 10 additions and 7 deletions

View File

@ -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

View File

@ -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

View File

@ -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
}

View File

@ -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
}