[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [libmicrohttpd] branch master updated (5b3cd84e -> 386f371d
From: |
gnunet |
Subject: |
[GNUnet-SVN] [libmicrohttpd] branch master updated (5b3cd84e -> 386f371d) |
Date: |
Sun, 01 Oct 2017 12:29:21 +0200 |
This is an automated email from the git hooks/post-receive script.
karlson2k pushed a change to branch master
in repository libmicrohttpd.
from 5b3cd84e test_options: really use this test instead of just compiling,
moved to src/microhttpd as it does not depend on libcurl
new cfddbb9d test_start_stop: moved to src/microhttpd, removed inclusion
of libcurl header
new 386f371d test_start_stop: silent compiler warnings
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/microhttpd/Makefile.am | 6 ++++++
src/{testcurl => microhttpd}/test_start_stop.c | 8 ++++++--
src/testcurl/Makefile.am | 6 ------
3 files changed, 12 insertions(+), 8 deletions(-)
rename src/{testcurl => microhttpd}/test_start_stop.c (90%)
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 90%
rename from src/testcurl/test_start_stop.c
rename to src/microhttpd/test_start_stop.c
index 71d50f54..d2e160b0 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
@@ -45,6 +44,10 @@ ahc_echo (void *cls,
const char *upload_data, size_t *upload_data_size,
void **unused)
{
+ (void)cls;(void)connection;(void)url; /* Unused. Silent compiler
warning. */
+ (void)method;(void)version;(void)upload_data; /* Unused. Silent compiler
warning. */
+ (void)upload_data_size;(void)unused; /* Unused. Silent compiler
warning. */
+
return MHD_NO;
}
@@ -107,6 +110,7 @@ int
main (int argc, char *const *argv)
{
unsigned int errorCount = 0;
+ (void)argc; (void)argv; /* Unused. Silent compiler warning. */
errorCount += testInternalGet (0);
errorCount += testMultithreadedGet (0);
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
- [GNUnet-SVN] [libmicrohttpd] branch master updated (5b3cd84e -> 386f371d),
gnunet <=