From 0eefd20ba370509d93fb7b0220e6d1c5739efac5 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Fri, 7 Dec 2018 12:40:32 +0100 Subject: add build option to compile MHD without threads --- src/testzzuf/Makefile.am | 16 ++++++++++++++-- src/testzzuf/test_get.c | 7 +++++-- src/testzzuf/test_get_chunked.c | 7 +++++-- src/testzzuf/test_post.c | 7 +++++-- src/testzzuf/test_post_form.c | 7 +++++-- src/testzzuf/test_put.c | 7 +++++-- src/testzzuf/test_put_chunked.c | 7 +++++-- src/testzzuf/test_put_large.c | 7 +++++-- 8 files changed, 49 insertions(+), 16 deletions(-) (limited to 'src/testzzuf') diff --git a/src/testzzuf/Makefile.am b/src/testzzuf/Makefile.am index 329fe04d..be31bad2 100644 --- a/src/testzzuf/Makefile.am +++ b/src/testzzuf/Makefile.am @@ -11,6 +11,9 @@ AM_CPPFLAGS = -I$(top_srcdir)/src/include \ EXTRA_DIST = README socat.c +THREAD_ONLY_TESTS = \ + test_long_header + check_PROGRAMS = \ test_get \ test_get_chunked \ @@ -23,8 +26,17 @@ check_PROGRAMS = \ test_post11 \ test_post_form11 \ test_put11 \ - test_put_large11 \ - test_long_header + test_put_large11 + +if USE_POSIX_THREADS +check_PROGRAMS += + $(THREAD_ONLY_TESTS) +endif +if USE_W32_THREADS +check_PROGRAMS += + $(THREAD_ONLY_TESTS) +endif + TESTS = $(check_PROGRAMS) diff --git a/src/testzzuf/test_get.c b/src/testzzuf/test_get.c index 7e116d09..223b85e5 100644 --- a/src/testzzuf/test_get.c +++ b/src/testzzuf/test_get.c @@ -306,8 +306,11 @@ main (int argc, char *const *argv) (NULL != strstr (strrchr (argv[0], (int) '/'), "11")) : 0; if (0 != curl_global_init (CURL_GLOBAL_WIN32)) return 2; - errorCount += testInternalGet (); - errorCount += testMultithreadedGet (); + if (MHD_YES == MHD_is_feature_supported(MHD_FEATURE_THREADS)) + { + errorCount += testInternalGet (); + errorCount += testMultithreadedGet (); + } errorCount += testExternalGet (); if (errorCount != 0) fprintf (stderr, "Error (code: %u)\n", errorCount); diff --git a/src/testzzuf/test_get_chunked.c b/src/testzzuf/test_get_chunked.c index a74b5d9f..44828853 100644 --- a/src/testzzuf/test_get_chunked.c +++ b/src/testzzuf/test_get_chunked.c @@ -335,8 +335,11 @@ main (int argc, char *const *argv) if (0 != curl_global_init (CURL_GLOBAL_WIN32)) return 2; - errorCount += testInternalGet (); - errorCount += testMultithreadedGet (); + if (MHD_YES == MHD_is_feature_supported(MHD_FEATURE_THREADS)) + { + errorCount += testInternalGet (); + errorCount += testMultithreadedGet (); + } errorCount += testExternalGet (); if (errorCount != 0) fprintf (stderr, "Error (code: %u)\n", errorCount); diff --git a/src/testzzuf/test_post.c b/src/testzzuf/test_post.c index 9a4a8e9c..836f3395 100644 --- a/src/testzzuf/test_post.c +++ b/src/testzzuf/test_post.c @@ -389,8 +389,11 @@ main (int argc, char *const *argv) (NULL != strstr (strrchr (argv[0], (int) '/'), "11")) : 0; if (0 != curl_global_init (CURL_GLOBAL_WIN32)) return 2; - errorCount += testInternalPost (); - errorCount += testMultithreadedPost (); + if (MHD_YES == MHD_is_feature_supported(MHD_FEATURE_THREADS)) + { + errorCount += testInternalPost (); + errorCount += testMultithreadedPost (); + } errorCount += testExternalPost (); if (errorCount != 0) fprintf (stderr, "Error (code: %u)\n", errorCount); diff --git a/src/testzzuf/test_post_form.c b/src/testzzuf/test_post_form.c index d4e01c2b..571c9d99 100644 --- a/src/testzzuf/test_post_form.c +++ b/src/testzzuf/test_post_form.c @@ -405,8 +405,11 @@ main (int argc, char *const *argv) (NULL != strstr (strrchr (argv[0], (int) '/'), "11")) : 0; if (0 != curl_global_init (CURL_GLOBAL_WIN32)) return 2; - errorCount += testInternalPost (); - errorCount += testMultithreadedPost (); + if (MHD_YES == MHD_is_feature_supported(MHD_FEATURE_THREADS)) + { + errorCount += testInternalPost (); + errorCount += testMultithreadedPost (); + } errorCount += testExternalPost (); if (errorCount != 0) fprintf (stderr, "Error (code: %u)\n", errorCount); diff --git a/src/testzzuf/test_put.c b/src/testzzuf/test_put.c index cfe12dee..63518ba8 100644 --- a/src/testzzuf/test_put.c +++ b/src/testzzuf/test_put.c @@ -353,8 +353,11 @@ main (int argc, char *const *argv) (NULL != strstr (strrchr (argv[0], (int) '/'), "11")) : 0; if (0 != curl_global_init (CURL_GLOBAL_WIN32)) return 2; - errorCount += testInternalPut (); - errorCount += testMultithreadedPut (); + if (MHD_YES == MHD_is_feature_supported(MHD_FEATURE_THREADS)) + { + errorCount += testInternalPut (); + errorCount += testMultithreadedPut (); + } errorCount += testExternalPut (); if (errorCount != 0) fprintf (stderr, "Error (code: %u)\n", errorCount); diff --git a/src/testzzuf/test_put_chunked.c b/src/testzzuf/test_put_chunked.c index 72a9f316..642e968a 100644 --- a/src/testzzuf/test_put_chunked.c +++ b/src/testzzuf/test_put_chunked.c @@ -363,8 +363,11 @@ main (int argc, char *const *argv) if (0 != curl_global_init (CURL_GLOBAL_WIN32)) return 2; - errorCount += testInternalPut (); - errorCount += testMultithreadedPut (); + if (MHD_YES == MHD_is_feature_supported(MHD_FEATURE_THREADS)) + { + errorCount += testInternalPut (); + errorCount += testMultithreadedPut (); + } errorCount += testExternalPut (); if (errorCount != 0) fprintf (stderr, "Error (code: %u)\n", errorCount); diff --git a/src/testzzuf/test_put_large.c b/src/testzzuf/test_put_large.c index 540c37f9..40861b87 100644 --- a/src/testzzuf/test_put_large.c +++ b/src/testzzuf/test_put_large.c @@ -373,8 +373,11 @@ main (int argc, char *const *argv) return 2; put_buffer = malloc (PUT_SIZE); memset (put_buffer, 1, PUT_SIZE); - errorCount += testInternalPut (); - errorCount += testMultithreadedPut (); + if (MHD_YES == MHD_is_feature_supported(MHD_FEATURE_THREADS)) + { + errorCount += testInternalPut (); + errorCount += testMultithreadedPut (); + } errorCount += testExternalPut (); free (put_buffer); if (errorCount != 0) -- cgit v1.2.3