tests: srp tests moved outside subdir

3 files changed, 2 insertions, 53 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index d43501dc49..8341f901cf 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -20,7 +20,7 @@
 # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 SUBDIRS = . cert-tests ocsp-tests key-tests safe-renegotiation scripts \
-	slow dtls srp windows
+	slow dtls windows
 
 if ENABLE_OPENPGP
 SUBDIRS += openpgp-certs
@@ -110,7 +110,7 @@ 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
+	 set_x509_key_file_ocsp client-fastopen rng-sigint srp
 
 if HAVE_SECCOMP_TESTS
 ctests += dtls-with-seccomp tls-with-seccomp dtls-client-with-seccomp tls-client-with-seccomp
diff --git a/tests/srp/mini-srp.c b/tests/srp.c
index 35b42e0631..35b42e0631 100644
--- a/tests/srp/mini-srp.c
+++ b/tests/srp.c
diff --git a/tests/srp/Makefile.am b/tests/srp/Makefile.am
deleted file mode 100644
index e3d25f562f..0000000000
--- a/tests/srp/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.
-
-AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
-AM_CPPFLAGS = \
-	-I$(top_srcdir)/tests			\
-	-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)/doc/examples
-
-AM_LDFLAGS = -no-install
-LDADD = ../../lib/libgnutls.la \
-	../../gl/libgnu.la \
-	../libutils.la \
-	$(LIBSOCKET) $(INET_NTOP_LIB) $(INET_PTON_LIB) \
-	$(LIB_TIMER_TIME)
-
-if !WINDOWS
-
-check_PROGRAMS = mini-srp
-TESTS = mini-srp
-
-endif
-
-TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT) \
-	LC_ALL="C"						\
-	top_builddir="$(top_builddir)"				\
-	srcdir="$(srcdir)"