[GNUnet-SVN] [libmicrohttpd] 01/02: test_start_stop: moved to src/microhttpd, removed inclusion of libcurl header

[gnunet]

This is an automated email from the git hooks/post-receive script.

karlson2k pushed a commit to branch master
in repository libmicrohttpd.

commit cfddbb9dc7d5d1aa964b6ce86fb090c56f800452
Author: Evgeny Grin (Karlson2k) <address@hidden>
AuthorDate: Sun Oct 1 01:09:22 2017 +0300

    test_start_stop: moved to src/microhttpd, removed inclusion of libcurl 
header
---
 src/microhttpd/Makefile.am                     | 6 ++++++
 src/{testcurl => microhttpd}/test_start_stop.c | 3 +--
 src/testcurl/Makefile.am                       | 6 ------
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/microhttpd/Makefile.am b/src/microhttpd/Makefile.am
index 952148be..0f2672de 100644
--- a/src/microhttpd/Makefile.am
+++ b/src/microhttpd/Makefile.am
@@ -144,6 +144,7 @@ check_PROGRAMS = \
   test_str_to_value \
   test_str_token \
   test_http_reasons \
+  test_start_stop \
   test_daemon \
   test_options
 
@@ -175,6 +176,11 @@ check_PROGRAMS += \
   test_shutdown_poll_ignore
 endif
 
+test_start_stop_SOURCES = \
+  test_start_stop.c
+test_start_stop_LDADD = \
+  $(top_builddir)/src/microhttpd/libmicrohttpd.la
+
 test_daemon_SOURCES = \
   test_daemon.c
 test_daemon_LDADD = \
diff --git a/src/testcurl/test_start_stop.c b/src/microhttpd/test_start_stop.c
similarity index 98%
rename from src/testcurl/test_start_stop.c
rename to src/microhttpd/test_start_stop.c
index 71d50f54..1dd83575 100644
--- a/src/testcurl/test_start_stop.c
+++ b/src/microhttpd/test_start_stop.c
@@ -23,9 +23,8 @@
  * @brief  test for #1901 (start+stop)
  * @author Christian Grothoff
  */
-#include "MHD_config.h"
+#include "mhd_options.h"
 #include "platform.h"
-#include <curl/curl.h>
 #include <microhttpd.h>
 
 #if defined(CPU_COUNT) && (CPU_COUNT+0) < 2
diff --git a/src/testcurl/Makefile.am b/src/testcurl/Makefile.am
index 10fae873..796ea9e2 100644
--- a/src/testcurl/Makefile.am
+++ b/src/testcurl/Makefile.am
@@ -18,7 +18,6 @@ $(LIBCURL_CPPFLAGS)
 
 if HAVE_CURL
 check_PROGRAMS = \
-  test_start_stop \
   test_get \
   test_get_sendfile \
   test_urlparse \
@@ -83,11 +82,6 @@ endif
 libcurl_version_check_a_SOURCES = \
   curl_version_check.c
 
-test_start_stop_SOURCES = \
-  test_start_stop.c
-test_start_stop_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la
-
 test_concurrent_stop_SOURCES = \
   test_concurrent_stop.c
 test_concurrent_stop_CFLAGS = \

-- 
To stop receiving notification emails like this one, please contact
address@hidden