aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeny Grin (Karlson2k) <k2k@narod.ru>2017-10-01 01:09:22 +0300
committerEvgeny Grin (Karlson2k) <k2k@narod.ru>2017-10-01 01:09:22 +0300
commitcfddbb9dc7d5d1aa964b6ce86fb090c56f800452 (patch)
treed7de04f4a1e2aeaed396abb0ce8cb43dbead0ad9
parent5b3cd84e62b430c34b5cf2cef20e49b11155a69d (diff)
downloadlibmicrohttpd-cfddbb9dc7d5d1aa964b6ce86fb090c56f800452.tar.gz
libmicrohttpd-cfddbb9dc7d5d1aa964b6ce86fb090c56f800452.zip
test_start_stop: moved to src/microhttpd, removed inclusion of libcurl header
-rw-r--r--src/microhttpd/Makefile.am6
-rw-r--r--src/microhttpd/test_start_stop.c (renamed from src/testcurl/test_start_stop.c)3
-rw-r--r--src/testcurl/Makefile.am6
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 = \
144 test_str_to_value \ 144 test_str_to_value \
145 test_str_token \ 145 test_str_token \
146 test_http_reasons \ 146 test_http_reasons \
147 test_start_stop \
147 test_daemon \ 148 test_daemon \
148 test_options 149 test_options
149 150
@@ -175,6 +176,11 @@ check_PROGRAMS += \
175 test_shutdown_poll_ignore 176 test_shutdown_poll_ignore
176endif 177endif
177 178
179test_start_stop_SOURCES = \
180 test_start_stop.c
181test_start_stop_LDADD = \
182 $(top_builddir)/src/microhttpd/libmicrohttpd.la
183
178test_daemon_SOURCES = \ 184test_daemon_SOURCES = \
179 test_daemon.c 185 test_daemon.c
180test_daemon_LDADD = \ 186test_daemon_LDADD = \
diff --git a/src/testcurl/test_start_stop.c b/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 @@
23 * @brief test for #1901 (start+stop) 23 * @brief test for #1901 (start+stop)
24 * @author Christian Grothoff 24 * @author Christian Grothoff
25 */ 25 */
26#include "MHD_config.h" 26#include "mhd_options.h"
27#include "platform.h" 27#include "platform.h"
28#include <curl/curl.h>
29#include <microhttpd.h> 28#include <microhttpd.h>
30 29
31#if defined(CPU_COUNT) && (CPU_COUNT+0) < 2 30#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)
18 18
19if HAVE_CURL 19if HAVE_CURL
20check_PROGRAMS = \ 20check_PROGRAMS = \
21 test_start_stop \
22 test_get \ 21 test_get \
23 test_get_sendfile \ 22 test_get_sendfile \
24 test_urlparse \ 23 test_urlparse \
@@ -83,11 +82,6 @@ endif
83libcurl_version_check_a_SOURCES = \ 82libcurl_version_check_a_SOURCES = \
84 curl_version_check.c 83 curl_version_check.c
85 84
86test_start_stop_SOURCES = \
87 test_start_stop.c
88test_start_stop_LDADD = \
89 $(top_builddir)/src/microhttpd/libmicrohttpd.la
90
91test_concurrent_stop_SOURCES = \ 85test_concurrent_stop_SOURCES = \
92 test_concurrent_stop.c 86 test_concurrent_stop.c
93test_concurrent_stop_CFLAGS = \ 87test_concurrent_stop_CFLAGS = \