[GNUnet-SVN] [libmicrohttpd] 02/02: test_options: really use this test instead of just compiling, moved to src/microhttpd as it does not depend on libcurl

[gnunet]

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

karlson2k pushed a commit to branch master
in repository libmicrohttpd.

commit 5b3cd84e62b430c34b5cf2cef20e49b11155a69d
Author: Evgeny Grin (Karlson2k) <address@hidden>
AuthorDate: Sat Sep 30 20:26:31 2017 +0300

    test_options: really use this test instead of just compiling,
    moved to src/microhttpd as it does not depend on libcurl
---
 src/microhttpd/Makefile.am                  | 8 +++++++-
 src/{testcurl => microhttpd}/test_options.c | 0
 src/testcurl/Makefile.am                    | 8 --------
 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 = \
   test_str_to_value \
   test_str_token \
   test_http_reasons \
-  test_daemon
+  test_daemon \
+  test_options
 
 if HAVE_POSIX_THREADS
 if ENABLE_UPGRADE
@@ -278,3 +279,8 @@ test_str_token_SOURCES = \
 test_http_reasons_SOURCES = \
   test_http_reasons.c \
   reason_phrase.c mhd_str.c mhd_str.h
+
+test_options_SOURCES = \
+  test_options.c
+test_options_LDADD = \
+  $(top_builddir)/src/microhttpd/libmicrohttpd.la
diff --git a/src/testcurl/test_options.c b/src/microhttpd/test_options.c
similarity index 100%
rename from src/testcurl/test_options.c
rename to 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
   test_post_loop11
 endif
 
-noinst_PROGRAMS = \
-  test_options
-
 if ENABLE_DAUTH
   check_PROGRAMS += \
        test_digestauth test_digestauth_with_arguments
@@ -99,11 +96,6 @@ test_concurrent_stop_LDADD = \
   $(top_builddir)/src/microhttpd/libmicrohttpd.la \
   $(PTHREAD_LIBS) @LIBCURL@
 
-test_options_SOURCES = \
-  test_options.c
-test_options_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la
-
 test_get_SOURCES = \
   test_get.c
 test_get_LDADD = \

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