[libmicrohttpd] branch master updated (0c132072 -> efd1dd05)

[gnunet]

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

karlson2k pushed a change to branch master
in repository libmicrohttpd.

    from 0c132072 test_concurrent_stop: check for client errors
     new f7c5d0d6 makefiles: removed .NOTPARALLEL: from main makefiles Library 
itself, main tests and libcurl test could be build and performed in parallel 
due to MHD_FEATURE_AUTODETECT_BIND_PORT feature testzzuf tests still need to be 
updated for support of parallel testing
     new efd1dd05 perf_get_concurrent: reduce number of iteration on W32 as 
free ports are quickly excused on W32 with large amount of CPU cores

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/Makefile.am                    |  2 ++
 src/microhttpd/Makefile.am         |  2 --
 src/testcurl/Makefile.am           | 10 ++++++----
 src/testcurl/perf_get_concurrent.c |  4 ++++
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index ee9c3fcb..1f43e73d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,3 +22,5 @@ endif
 EXTRA_DIST = \
  datadir/cert-and-key.pem \
  datadir/cert-and-key-for-wireshark.pem 
+
+.NOTPARALLEL:
diff --git a/src/microhttpd/Makefile.am b/src/microhttpd/Makefile.am
index 5292593f..7a814603 100644
--- a/src/microhttpd/Makefile.am
+++ b/src/microhttpd/Makefile.am
@@ -150,8 +150,6 @@ libmicrohttpd_la_SOURCES += \
   connection_https.c connection_https.h
 endif
 
-.NOTPARALLEL:
-
 check_PROGRAMS = \
   test_str_compare \
   test_str_to_value \
diff --git a/src/testcurl/Makefile.am b/src/testcurl/Makefile.am
index 511a4c13..687b77bf 100644
--- a/src/testcurl/Makefile.am
+++ b/src/testcurl/Makefile.am
@@ -25,14 +25,11 @@ THREAD_ONLY_TESTS = \
   test_termination \
   test_timeout
 
-.NOTPARALLEL:
-
 if HAVE_POSIX_THREADS
 THREAD_ONLY_TESTS += \
   perf_get_concurrent11 \
   test_quiesce \
-  test_concurrent_stop \
-  perf_get_concurrent
+  test_concurrent_stop
 
 if HAVE_CURL_BINARY
 THREAD_ONLY_TESTS += \
@@ -47,6 +44,11 @@ if ENABLE_DAUTH
     test_digestauth_with_arguments
 endif
 
+if HAVE_POSIX_THREADS
+THREAD_ONLY_TESTS += \
+  perf_get_concurrent
+endif
+  
 if HAVE_CURL
 check_PROGRAMS = \
   test_get \
diff --git a/src/testcurl/perf_get_concurrent.c 
b/src/testcurl/perf_get_concurrent.c
index 0471143c..a0c5ebb1 100644
--- a/src/testcurl/perf_get_concurrent.c
+++ b/src/testcurl/perf_get_concurrent.c
@@ -56,7 +56,11 @@
  * Ensure that free ports are not exhausted during test.
  */
 #if CPU_COUNT > 8
+#ifndef _WIN32
 #define ROUNDS (1 + (30000 / 12) / CPU_COUNT)
+#else /* _WIN32 */
+#define ROUNDS (1 + (10000 / 12) / CPU_COUNT)
+#endif /* _WIN32 */
 #else
 #define ROUNDS 500
 #endif

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.