Explorar el Código

test_options: really use this test instead of just compiling,
moved to src/microhttpd as it does not depend on libcurl

Evgeny Grin (Karlson2k) hace 8 años
padre
commit
5b3cd84e62
Se han modificado 3 ficheros con 7 adiciones y 9 borrados
  1. 7 1
      src/microhttpd/Makefile.am
  2. 0 0
      src/microhttpd/test_options.c
  3. 0 8
      src/testcurl/Makefile.am

+ 7 - 1
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

+ 0 - 0
src/testcurl/test_options.c → src/microhttpd/test_options.c


+ 0 - 8
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 = \