tests: dtls subdir was merged into main tests

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>

3 files changed, 13 insertions, 54 deletions

diff --git a/configure.ac b/configure.ac
index 6b46887509..05c58fe7b9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -963,7 +963,6 @@ AC_CONFIG_FILES([
   tests/Makefile
   tests/windows/Makefile
   tests/cert-tests/Makefile
-  tests/dtls/Makefile
   tests/key-tests/Makefile
   tests/slow/Makefile
   tests/suite/Makefile
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 18d8b3eaa4..10aa9e886b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -19,7 +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 key-tests slow dtls windows
+SUBDIRS = . cert-tests key-tests slow windows
 
 if WANT_TEST_SUITE
 SUBDIRS += suite
@@ -70,7 +70,7 @@ AM_CPPFLAGS = \
 
 AM_LDFLAGS = -no-install
 COMMON_GNUTLS_LDADD = ../lib/libgnutls.la
-COMMON_DEPS_LDADD = $(LIBSOCKET) $(INET_NTOP_LIB) $(INET_PTON_LIB) $(LIBSECCOMP)
+COMMON_DEPS_LDADD = $(LIBSOCKET) $(INET_NTOP_LIB) $(INET_PTON_LIB) $(LIBSECCOMP) $(LIBRT)
 COMMON_LDADD = $(COMMON_GNUTLS_LDADD) $(COMMON_DEPS_LDADD)
 
 LDADD = $(COMMON_GNUTLS_LDADD) \
@@ -313,6 +313,17 @@ name_constraints_merge_CPPFLAGS = $(AM_CPPFLAGS) \
 dist_check_SCRIPTS = rfc2253-escape-test rsa-md5-collision/rsa-md5-collision.sh systemkey.sh
 
 if !WINDOWS
+dist_check_SCRIPTS += dtls/dtls dtls/dtls-resume #dtls/dtls-nb
+
+indirect_tests += dtls-stress
+
+dtls_stress_SOURCES = dtls/dtls-stress.c
+dtls_stress_LDADD = $(COMMON_GNUTLS_LDADD) \
+	$(COMMON_DEPS_LDADD)
+
+endif
+
+if !WINDOWS
 dist_check_SCRIPTS += fastopen.sh pkgconfig.sh starttls.sh starttls-ftp.sh starttls-smtp.sh \
 	starttls-lmtp.sh starttls-pop3.sh starttls-nntp.sh starttls-sieve.sh \
 	ocsp-tests/ocsp-tls-connection ocsp-tests/ocsp-must-staple-connection \
diff --git a/tests/dtls/Makefile.am b/tests/dtls/Makefile.am
deleted file mode 100644
index 6c8f411121..0000000000
--- a/tests/dtls/Makefile.am
+++ /dev/null
@@ -1,51 +0,0 @@
-## Process this file with automake to produce Makefile.in
-# Copyright (C) 2012 Free Software Foundation, Inc.
-#
-# Author: Nikos Mavrogiannopoulos
-#
-# 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.
-
-dist_check_SCRIPTS = dtls dtls-nb dtls-resume
-
-AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/gl			\
-	-I$(top_builddir)/gl			\
-	-I$(top_srcdir)/lib/includes		\
-	-I$(top_builddir)/lib/includes		\
-	-I$(top_srcdir)/extra/includes	\
-	-I$(top_builddir)/extra/includes	\
-	-I$(top_srcdir)/lib			\
-	-I$(top_srcdir)/tests			\
-	-I$(top_srcdir)/doc/examples
-
-AM_LDFLAGS = -no-install
-LDADD = ../../lib/libgnutls.la \
-	../../gl/libgnu.la \
-	$(LIBSOCKET) $(INET_NTOP_LIB) $(INET_PTON_LIB) $(LIBRT)
-
-if !WINDOWS
-
-check_PROGRAMS = dtls-stress
-TESTS = dtls dtls-resume
-
-endif
-
-TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT) \
-	LC_ALL="C"						\
-	top_builddir="$(top_builddir)"				\
-	srcdir="$(srcdir)"