[libmicrohttpd] branch master updated (553f3e5d -> 0b07383f)

[gnunet]

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

karlson2k pushed a change to branch master
in repository libmicrohttpd.

    from 553f3e5d configure: added summary message about heavy tests
     new a64f771a test-suite: marked some tests as "very heavy" tests
     new b7475cd8 configure: removed extra empty lines in built-in help
     new 0b07383f configure: sorted summary messages

The 3 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:
 configure.ac         | 80 ++++++++++++++++++++++++++++++++++------------------
 src/testzzuf/socat.c |  6 ++--
 2 files changed, 56 insertions(+), 30 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3ad191ec..536a4d66 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1510,23 +1510,49 @@ test "x$enable_examples" = "xno" || enable_examples=yes
 AM_CONDITIONAL([BUILD_EXAMPLES], [test "x$enable_examples" = "xyes"])
 
 AC_ARG_ENABLE([[heavy-tests]],
-  [AS_HELP_STRING([[--enable-heavy-tests]], [use heavy tests in test-suite. 
WARNING:]
+  [AS_HELP_STRING([[--enable-heavy-tests[=SCOPE]]], [use SCOPE of heavy tests 
in test-suite. WARNING:]
   [a dedicated host with minimal number of background processes and no network]
-  [activity is recommended to enable.])], [],
+  [activity is recommended to enable. (basic, full)])], [],
     [enable_heavy_tests=no])
-AS_VAR_IF([enable_heavy_tests], ["yes"],
+use_heavy_tests="no"
+use_vheavy_tests="no"
+use_heavy_tests_MSG="no"
+AS_CASE([${enable_heavy_tests}],
+  [yes|basic],
+  [
+       enable_heavy_tests="basic"
+    use_heavy_tests="yes"
+    use_vheavy_tests="no"
+    use_heavy_tests_MSG="yes, basic heavy tests (a dedicated host is 
recommended)"
+  ],
+  [all|full],
+  [
+       enable_heavy_tests="full"
+    use_heavy_tests="yes"
+    use_vheavy_tests="yes"
+    use_heavy_tests_MSG="yes, full set of heavy tests (a dedicated host is 
recommended)"
+  ],
+  [no],
+  [
+    use_heavy_tests="no"
+    use_vheavy_tests="no"
+    use_heavy_tests_MSG="no"
+  ],
+  [AC_MSG_ERROR([[Unknown parameter value: 
--enable-heavy-tests=${enable_heavy_tests}]])]
+)
+AS_VAR_IF([use_heavy_tests], ["yes"],
   [
     HEAVY_TESTS_NOTPARALLEL='.NOTPARALLEL:'
     AC_DEFINE([_MHD_HEAVY_TESTS], [1], [Define to 1 to enable "heavy" test 
paths.])
-    heavy_tests_MSG="yes (dedicated host is recommended)"
+    AS_VAR_IF([use_vheavy_tests], ["yes"],
+      [AC_DEFINE([_MHD_VHEAVY_TESTS], [1], [Define to 1 to enable "very heavy" 
test paths.])]
+    )
   ],
   [
-    enable_heavy_tests=no
     HEAVY_TESTS_NOTPARALLEL=" "
-    heavy_tests_MSG="no"
   ]
 )
-AM_CONDITIONAL([HEAVY_TESTS],[test "x$enable_heavy_tests" = "xyes"])
+AM_CONDITIONAL([HEAVY_TESTS],[test "x$use_heavy_tests" = "xyes"])
 
 AC_ARG_ENABLE([[poll]],
   [AS_HELP_STRING([[--enable-poll[=ARG]]], [enable poll support (yes, no, 
auto) [auto]])],
@@ -2665,7 +2691,7 @@ AC_MSG_RESULT([[$enable_postprocessor]])
 
 # optional: have zzuf, socat?
 run_zzuf_tests="no"
-AS_VAR_IF([enable_heavy_tests],["yes"],
+AS_VAR_IF([use_heavy_tests],["yes"],
   [
     AS_VAR_IF([enable_curl],["yes"],
       [
@@ -3148,8 +3174,8 @@ AC_MSG_RESULT([[$enable_cookie]])
 
 # optional: MD5 support for Digest Auth. Enabled by default.
 AC_ARG_ENABLE([[md5]],
-  [AS_HELP_STRING([[--enable-md5=TYPE]],[enable TYPE of MD5 hashing code (yes, 
no, builtin, tlslib) [yes if dauth enabled]])
-  ],
+  [AS_HELP_STRING([[--enable-md5=TYPE]],
+    [enable TYPE of MD5 hashing code (yes, no, builtin, tlslib) [yes if dauth 
enabled]])],
   [
     AS_VAR_IF([enable_md5],["internal"],[enable_md5='builtin'])
     AS_VAR_IF([enable_md5],["built-in"],[enable_md5='builtin'])
@@ -3271,8 +3297,8 @@ AC_MSG_RESULT([[${enable_md5_MSG}]])
 
 # optional: SHA-256 support for Digest Auth. Enabled by default.
 AC_ARG_ENABLE([[sha256]],
-  [AS_HELP_STRING([[--enable-sha256=TYPE]],[enable TYPE of SHA-256 hashing 
code (yes, no, builtin, tlslib) [yes if dauth enabled]])
-  ],
+  [AS_HELP_STRING([[--enable-sha256=TYPE]],
+    [enable TYPE of SHA-256 hashing code (yes, no, builtin, tlslib) [yes if 
dauth enabled]])],
   [
     AS_VAR_IF([enable_sha256],["internal"],[enable_sha256='builtin'])
     AS_VAR_IF([enable_sha256],["built-in"],[enable_sha256='builtin'])
@@ -3394,8 +3420,8 @@ AC_MSG_RESULT([[${enable_sha256_MSG}]])
 
 # optional: SHA-512/256 support for Digest Auth. Enabled by default.
 AC_ARG_ENABLE([[sha512-256]],
-  [AS_HELP_STRING([[--disable-sha512-256]],[disable SHA-512/256 hashing 
support for Digest Authentication])
-  ],
+  [AS_HELP_STRING([[--disable-sha512-256]],
+    [disable SHA-512/256 hashing support for Digest Authentication])],
   [
     AS_VAR_IF([[enable_sha512_256]],[["yes"]],
       [
@@ -3600,7 +3626,7 @@ AM_CONDITIONAL([USE_COVERAGE], [test "x$use_gcov" = 
"xyes"])
 
 AX_COUNT_CPUS
 AC_MSG_CHECKING([for number of CPU cores to use in tests])
-AS_VAR_IF([enable_heavy_tests], ["yes"],
+AS_VAR_IF([use_heavy_tests], ["yes"],
   [
     # Enable usage of many core if heavy tests are enabled
     AS_IF([[test "$CPU_COUNT" -gt "32"]], [[CPU_COUNT="32"]])dnl Limit 
resource usage
@@ -4296,32 +4322,32 @@ AC_MSG_NOTICE([GNU libmicrohttpd ${PACKAGE_VERSION} 
Configuration Summary:
   Target directory:  ${prefix}
   Cross-compiling:   ${cross_compiling}
   Operating System:  ${mhd_host_os}${os_ver_msg}
+  Messages:          ${enable_messages}
+  Cookie parsing:    ${enable_cookie}
+  Postproc:          ${enable_postprocessor}
+  HTTP "Upgrade":    ${enable_httpupgrade}
+  Basic auth.:       ${enable_bauth}
+  Digest auth.:      ${enable_dauth}
+  MD5:               ${enable_md5_MSG}
+  SHA-256:           ${enable_sha256_MSG}
+  SHA-512/256:       ${enable_sha512_256_MSG}
   Shutdown of listening socket triggers select: 
${mhd_cv_host_shtdwn_trgr_select}
   Inter-thread comm: ${use_itc}
+  Threading lib:     ${USE_THREADS}
   poll support:      ${enable_poll=no}
   epoll support:     ${enable_epoll=no}
   sendfile used:     ${found_sendfile}
   HTTPS support:     ${MSG_HTTPS}
-  Threading lib:     ${USE_THREADS}
-  Use thread names:  ${enable_thread_names}
   Compact code:      ${enable_compact_code} (${compact_code_MSG})
+  Use thread names:  ${enable_thread_names}
   Use debug asserts: ${enable_asserts}
   Use sanitizers:    ${enabled_sanitizers:=no}
-  Messages:          ${enable_messages}
-  Basic auth.:       ${enable_bauth}
-  Digest auth.:      ${enable_dauth}
-  MD5:               ${enable_md5_MSG}
-  SHA-256:           ${enable_sha256_MSG}
-  SHA-512/256:       ${enable_sha512_256_MSG}
-  HTTP "Upgrade":    ${enable_httpupgrade}
-  Cookie parsing:    ${enable_cookie}
-  Postproc:          ${enable_postprocessor}
   Build docs:        ${enable_doc}
   Build examples:    ${enable_examples}
   Build static lib:  ${enable_static}
   Build shared lib:  ${enable_shared}
   Test with libcurl: ${MSG_CURL}
-  Heavy tests:       ${heavy_tests_MSG}
+  Heavy tests:       ${use_heavy_tests_MSG}
   Fuzzing tests:     ${run_zzuf_tests_MSG=no}
 ])
 
diff --git a/src/testzzuf/socat.c b/src/testzzuf/socat.c
index 85423aad..0ee14749 100644
--- a/src/testzzuf/socat.c
+++ b/src/testzzuf/socat.c
@@ -43,11 +43,11 @@
  * long for most user's patience.  So this small
  * value is the default.
  */
-#ifndef _MHD_HEAVY_TESTS
+#ifndef _MHD_VHEAVY_TESTS
 #define LOOP_COUNT 10
-#else  /* ! _MHD_HEAVY_TESTS */
+#else  /* ! _MHD_VHEAVY_TESTS */
 #define LOOP_COUNT 200
-#endif /* ! _MHD_HEAVY_TESTS */
+#endif /* ! _MHD_VHEAVY_TESTS */
 
 #define CURL_TIMEOUT 50L
 

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