From 8fb13655271cf34266d46d7196fc8feb1dec7ebe Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Thu, 28 Jul 2016 13:34:34 +0200 Subject: tests: safe renegotiation tests are run from top dir --- tests/Makefile.am | 10 ++++--- tests/safe-renegotiation/Makefile.am | 39 -------------------------- tests/safe-renegotiation/suppressions.valgrind | 0 3 files changed, 6 insertions(+), 43 deletions(-) delete mode 100644 tests/safe-renegotiation/Makefile.am delete mode 100644 tests/safe-renegotiation/suppressions.valgrind diff --git a/tests/Makefile.am b/tests/Makefile.am index 8341f901cf..bcc3122742 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -19,8 +19,7 @@ # along with this file; if not, write to the Free Software Foundation, # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -SUBDIRS = . cert-tests ocsp-tests key-tests safe-renegotiation scripts \ - slow dtls windows +SUBDIRS = . cert-tests ocsp-tests key-tests scripts slow dtls windows if ENABLE_OPENPGP SUBDIRS += openpgp-certs @@ -37,7 +36,8 @@ EXTRA_DIST = suppressions.valgrind eagain-common.h cert-common.h test-chains.h \ certs/ecc521.pem certs/rsa-2432.pem x509cert-dir/ca.pem psk.passwd \ system.prio pkcs11/softhsm.h pkcs11/pkcs11-pubkey-import.c gnutls-asan.supp \ rsa-md5-collision/MD5CollisionCA.cer rsa-md5-collision/TargetCollidingCertificate1.cer \ - rsa-md5-collision/TargetCollidingCertificate2.cer rsa-md5-collision/README + rsa-md5-collision/TargetCollidingCertificate2.cer rsa-md5-collision/README \ + safe-renegotiation/README AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) AM_CPPFLAGS = \ @@ -110,7 +110,9 @@ ctests = mini-record-2 simple gc set_pkcs12_cred certder certuniqueid \ dtls1.2-cert-key-exchange dtls1.0-cert-key-exchange x509-cert-callback-legacy \ keylog-env ssl2-hello tlsfeature-ext dtls-rehandshake-cert-2 \ tlsfeature-crt dtls-rehandshake-cert-3 resume-with-false-start \ - set_x509_key_file_ocsp client-fastopen rng-sigint srp + set_x509_key_file_ocsp client-fastopen rng-sigint srp \ + safe-renegotiation/srn0 safe-renegotiation/srn1 safe-renegotiation/srn2 \ + safe-renegotiation/srn3 safe-renegotiation/srn4 safe-renegotiation/srn5 if HAVE_SECCOMP_TESTS ctests += dtls-with-seccomp tls-with-seccomp dtls-client-with-seccomp tls-client-with-seccomp diff --git a/tests/safe-renegotiation/Makefile.am b/tests/safe-renegotiation/Makefile.am deleted file mode 100644 index f307cf2991..0000000000 --- a/tests/safe-renegotiation/Makefile.am +++ /dev/null @@ -1,39 +0,0 @@ -## Process this file with automake to produce Makefile.in -# Copyright (C) 2010, 2012 Free Software Foundation, Inc. -# -# This file is part of GnuTLS. -# -# This file is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 3 of the License, or -# (at your option) any later version. -# -# This file is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this file; if not, write to the Free Software Foundation, -# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) -AM_CPPFLAGS = \ - -I$(top_srcdir)/lib/includes \ - -I$(top_builddir)/lib/includes - -AM_LDFLAGS = -no-install -LDADD = ../libutils.la \ - ../../lib/libgnutls.la $(LIBSOCKET) - -ctests = srn0 srn1 srn2 srn3 srn4 srn5 - -check_PROGRAMS = $(ctests) -TESTS = $(ctests) - -TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT) \ - LC_ALL="C" \ - top_builddir="$(top_builddir)" \ - srcdir="$(srcdir)" - -EXTRA_DIST = README suppressions.valgrind diff --git a/tests/safe-renegotiation/suppressions.valgrind b/tests/safe-renegotiation/suppressions.valgrind deleted file mode 100644 index e69de29bb2..0000000000 -- cgit v1.2.1