aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvgeny Grin (Karlson2k) <k2k@narod.ru>2017-09-30 20:26:31 +0300
committerEvgeny Grin (Karlson2k) <k2k@narod.ru>2017-09-30 20:26:31 +0300
commit5b3cd84e62b430c34b5cf2cef20e49b11155a69d (patch)
tree5f61bb6d3bb9d5d6b51b0d5c6daf0be28c4f215a
parentadf9e8cec417d60fe7ae65dcff8e1cea961c6586 (diff)
downloadlibmicrohttpd-5b3cd84e62b430c34b5cf2cef20e49b11155a69d.tar.gz
libmicrohttpd-5b3cd84e62b430c34b5cf2cef20e49b11155a69d.zip
test_options: really use this test instead of just compiling,
moved to src/microhttpd as it does not depend on libcurl
-rw-r--r--src/microhttpd/Makefile.am8
-rw-r--r--src/microhttpd/test_options.c (renamed from src/testcurl/test_options.c)0
-rw-r--r--src/testcurl/Makefile.am8
3 files changed, 7 insertions, 9 deletions
diff --git a/src/microhttpd/Makefile.am b/src/microhttpd/Makefile.am
index 48a72b43..952148be 100644
--- a/src/microhttpd/Makefile.am
+++ b/src/microhttpd/Makefile.am
@@ -144,7 +144,8 @@ 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_daemon 147 test_daemon \
148 test_options
148 149
149if HAVE_POSIX_THREADS 150if HAVE_POSIX_THREADS
150if ENABLE_UPGRADE 151if ENABLE_UPGRADE
@@ -278,3 +279,8 @@ test_str_token_SOURCES = \
278test_http_reasons_SOURCES = \ 279test_http_reasons_SOURCES = \
279 test_http_reasons.c \ 280 test_http_reasons.c \
280 reason_phrase.c mhd_str.c mhd_str.h 281 reason_phrase.c mhd_str.c mhd_str.h
282
283test_options_SOURCES = \
284 test_options.c
285test_options_LDADD = \
286 $(top_builddir)/src/microhttpd/libmicrohttpd.la
diff --git a/src/testcurl/test_options.c b/src/microhttpd/test_options.c
index 3198c731..3198c731 100644
--- a/src/testcurl/test_options.c
+++ b/src/microhttpd/test_options.c
diff --git a/src/testcurl/Makefile.am b/src/testcurl/Makefile.am
index 7d315d5b..10fae873 100644
--- a/src/testcurl/Makefile.am
+++ b/src/testcurl/Makefile.am
@@ -70,9 +70,6 @@ if HAVE_POSTPROCESSOR
70 test_post_loop11 70 test_post_loop11
71endif 71endif
72 72
73noinst_PROGRAMS = \
74 test_options
75
76if ENABLE_DAUTH 73if ENABLE_DAUTH
77 check_PROGRAMS += \ 74 check_PROGRAMS += \
78 test_digestauth test_digestauth_with_arguments 75 test_digestauth test_digestauth_with_arguments
@@ -99,11 +96,6 @@ test_concurrent_stop_LDADD = \
99 $(top_builddir)/src/microhttpd/libmicrohttpd.la \ 96 $(top_builddir)/src/microhttpd/libmicrohttpd.la \
100 $(PTHREAD_LIBS) @LIBCURL@ 97 $(PTHREAD_LIBS) @LIBCURL@
101 98
102test_options_SOURCES = \
103 test_options.c
104test_options_LDADD = \
105 $(top_builddir)/src/microhttpd/libmicrohttpd.la
106
107test_get_SOURCES = \ 99test_get_SOURCES = \
108 test_get.c 100 test_get.c
109test_get_LDADD = \ 101test_get_LDADD = \