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

[gnunet]

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

karlson2k pushed a change to branch master
in repository libmicrohttpd.

    from b85d48cd -support mime-types by file extension in demo.c
     new 0458e0d2 testzzuf: fixed missing CPPFLAGS from configure
     new 9440f9ae configure: do not pass AM_TESTS_ENVIRONMENT directly
     new 0d61882d configure: minor refactoring for check for libcurl-based tests
     new 63b51815 configure: added summary message about fuzzing tests
     new 553f3e5d configure: added summary message about heavy tests

The 5 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                   | 62 ++++++++++++++++++++++++++++++++++--------
 doc/examples/Makefile.am       |  2 ++
 src/Makefile.am                | 15 +++++-----
 src/examples/Makefile.am       |  2 ++
 src/microhttpd/Makefile.am     |  2 ++
 src/testcurl/Makefile.am       |  4 ++-
 src/testcurl/https/Makefile.am |  2 ++
 src/testzzuf/Makefile.am       |  4 ++-
 8 files changed, 71 insertions(+), 22 deletions(-)

diff --git a/configure.ac b/configure.ac
index 2bf5bbe7..3ad191ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1518,10 +1518,12 @@ AS_VAR_IF([enable_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)"
   ],
   [
     enable_heavy_tests=no
     HEAVY_TESTS_NOTPARALLEL=" "
+    heavy_tests_MSG="no"
   ]
 )
 AM_CONDITIONAL([HEAVY_TESTS],[test "x$enable_heavy_tests" = "xyes"])
@@ -2410,7 +2412,11 @@ AS_IF([test "$enable_curl" != "no"],
       enable_curl=no
     ])
 ])
-AM_CONDITIONAL([HAVE_CURL], [test "x$enable_curl" = "xyes"])
+AM_CONDITIONAL([RUN_LIBCURL_TESTS], [test "x$enable_curl" = "xyes"])
+AS_IF([test "x$enable_curl" = "xyes"],
+  [MSG_CURL="yes"],
+  [MSG_CURL="no, many unit tests will not run"]
+)
 
 mhd_have_libmagic="no"
 SAVE_LIBS="$LIBS"
@@ -2658,10 +2664,44 @@ AC_MSG_RESULT([[$enable_postprocessor]])
 
 
 # optional: have zzuf, socat?
-AC_CHECK_PROG([have_zzuf],[zzuf], [yes], [no])
-AC_CHECK_PROG([have_socat],[socat], [yes], [no])
-AM_CONDITIONAL([HAVE_ZZUF], [test "x$have_zzuf" = "xyes"])
-AM_CONDITIONAL([HAVE_SOCAT], [test "x$have_socat" = "xyes"])
+run_zzuf_tests="no"
+AS_VAR_IF([enable_heavy_tests],["yes"],
+  [
+    AS_VAR_IF([enable_curl],["yes"],
+      [
+        AC_CHECK_PROG([have_zzuf],[zzuf],[yes],[no])
+        AS_VAR_IF([have_zzuf],["yes"],
+          [
+            AC_CHECK_PROG([have_socat],[socat],[yes],[no])
+            AS_VAR_IF([have_socat],["yes"],
+              [
+                run_zzuf_tests="yes"
+                run_zzuf_tests_MSG="yes"
+              ],
+              [
+                run_zzuf_tests="no"
+                run_zzuf_tests_MSG="no, socat tool not found"
+              ]
+            )
+          ],
+          [
+            run_zzuf_tests="no"
+            run_zzuf_tests_MSG="no, zzuf tool not found"
+          ]
+        )
+      ],
+      [
+        run_zzuf_tests="no"
+        run_zzuf_tests_MSG="no, tests with libcurl are not enabled"
+      ]
+    )
+  ],
+  [
+    run_zzuf_tests="no"
+    run_zzuf_tests_MSG="no, heavy tests are not enabled"
+  ]
+)
+AM_CONDITIONAL([RUN_ZZUF_TESTS],[test "x$run_zzuf_tests" = "xyes"])
 
 have_gnutls=no
 have_gnutls_sni=no
@@ -3616,7 +3656,7 @@ AS_VAR_IF([[enable_asserts]], [["yes"]],
 )
 
 AS_UNSET([enabled_sanitizers])
-AM_TESTS_ENVIRONMENT=""
+TESTS_ENVIRONMENT_ac=""
 AM_ASAN_OPTIONS=""
 AM_UBSAN_OPTIONS=""
 AM_LSAN_OPTIONS=""
@@ -4105,7 +4145,7 @@ int main(void)
            AS_VAR_IF([enable_san_leak], ["yes"],
              [AM_LSAN_OPTIONS="use_unaligned=1"]
            )
-           AM_TESTS_ENVIRONMENT='\
+           TESTS_ENVIRONMENT_ac='\
     ASAN_OPTIONS="$(AM_ASAN_OPTIONS)" ; export ASAN_OPTIONS ; \
     UBSAN_OPTIONS="$(AM_UBSAN_OPTIONS)" ; export UBSAN_OPTIONS ; \
     LSAN_OPTIONS="$(AM_LSAN_OPTIONS)" ; export LSAN_OPTIONS ;'
@@ -4132,7 +4172,7 @@ AM_CONDITIONAL([USE_SANITIZERS],
 AC_SUBST([AM_ASAN_OPTIONS])
 AC_SUBST([AM_UBSAN_OPTIONS])
 AC_SUBST([AM_LSAN_OPTIONS])
-AC_SUBST([AM_TESTS_ENVIRONMENT])
+AC_SUBST([TESTS_ENVIRONMENT_ac])
 
 MHD_LIB_LDFLAGS="$MHD_LIB_LDFLAGS"
 
@@ -4247,10 +4287,6 @@ AS_UNSET([fin_lib_CPPFLAGS])
 AS_UNSET([fin_lib_CFLAGS])
 AS_UNSET([fin_lib_LDFLAGS])
 
-AS_IF([test "x$enable_curl" != "xyes"],
- [MSG_CURL="no, many unit tests will not run"],
- [MSG_CURL="yes"])
-
 AS_VAR_IF([os_is_windows], ["yes"],
   [os_ver_msg="
   Target W32 ver:    ${mhd_w32_ver_msg}"], [AS_UNSET([[os_ver_msg]])])
@@ -4285,6 +4321,8 @@ AC_MSG_NOTICE([GNU libmicrohttpd ${PACKAGE_VERSION} 
Configuration Summary:
   Build static lib:  ${enable_static}
   Build shared lib:  ${enable_shared}
   Test with libcurl: ${MSG_CURL}
+  Heavy tests:       ${heavy_tests_MSG}
+  Fuzzing tests:     ${run_zzuf_tests_MSG=no}
 ])
 
 AS_IF([test "x$enable_https" = "xyes"],
diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am
index cdb787d9..c7a24354 100644
--- a/doc/examples/Makefile.am
+++ b/doc/examples/Makefile.am
@@ -9,6 +9,8 @@ AM_CFLAGS = $(CFLAGS_ac) @LIBGCRYPT_CFLAGS@
 
 AM_LDFLAGS = $(LDFLAGS_ac)
 
+AM_TESTS_ENVIRONMENT = $(TESTS_ENVIRONMENT_ac)
+
 if USE_COVERAGE
   AM_CFLAGS += --coverage
 endif
diff --git a/src/Makefile.am b/src/Makefile.am
index 0d2f49bc..85a10510 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,15 +1,14 @@
 # This Makefile.am is in the public domain
-if HAVE_CURL
-curltests = testcurl
-if HAVE_ZZUF
-if HAVE_SOCAT
-zzuftests = testzzuf
-endif
+
+SUBDIRS = include microhttpd .
+
+if RUN_LIBCURL_TESTS
+SUBDIRS += testcurl
+if RUN_ZZUF_TESTS
+SUBDIRS += testzzuf
 endif
 endif
 
-SUBDIRS = include microhttpd $(curltests) $(zzuftests) .
-
 # Finally (last!) also build experimental lib...
 if HAVE_EXPERIMENTAL
 SUBDIRS += microhttpd_ws lib
diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am
index c222b5db..7946745a 100644
--- a/src/examples/Makefile.am
+++ b/src/examples/Makefile.am
@@ -12,6 +12,8 @@ AM_LDFLAGS = $(LDFLAGS_ac)
 
 MHD_CPU_COUNT_DEF = -DMHD_CPU_COUNT=$(CPU_COUNT)
 
+AM_TESTS_ENVIRONMENT = $(TESTS_ENVIRONMENT_ac)
+
 if USE_COVERAGE
   AM_CFLAGS += --coverage
 endif
diff --git a/src/microhttpd/Makefile.am b/src/microhttpd/Makefile.am
index c25abab7..8e6e623a 100644
--- a/src/microhttpd/Makefile.am
+++ b/src/microhttpd/Makefile.am
@@ -8,6 +8,8 @@ AM_CFLAGS = $(CFLAGS_ac) $(HIDDEN_VISIBILITY_CFLAGS)
 
 AM_LDFLAGS = $(LDFLAGS_ac)
 
+AM_TESTS_ENVIRONMENT = $(TESTS_ENVIRONMENT_ac)
+
 lib_LTLIBRARIES = \
   libmicrohttpd.la
 
diff --git a/src/testcurl/Makefile.am b/src/testcurl/Makefile.am
index 11a489c3..e0f8d275 100644
--- a/src/testcurl/Makefile.am
+++ b/src/testcurl/Makefile.am
@@ -15,6 +15,8 @@ AM_CFLAGS = $(CFLAGS_ac) @LIBGCRYPT_CFLAGS@
 
 AM_LDFLAGS = $(LDFLAGS_ac)
 
+AM_TESTS_ENVIRONMENT = $(TESTS_ENVIRONMENT_ac)
+
 if USE_COVERAGE
   AM_CFLAGS += -fprofile-arcs -ftest-coverage
 endif
@@ -78,7 +80,7 @@ THREAD_ONLY_TESTS += \
 endif
 endif
 
-if HAVE_CURL
+if RUN_LIBCURL_TESTS
 check_PROGRAMS = \
   test_get \
   test_head \
diff --git a/src/testcurl/https/Makefile.am b/src/testcurl/https/Makefile.am
index 324076ef..324a5314 100644
--- a/src/testcurl/https/Makefile.am
+++ b/src/testcurl/https/Makefile.am
@@ -16,6 +16,8 @@ AM_CFLAGS = $(CFLAGS_ac) @LIBGCRYPT_CFLAGS@
 
 AM_LDFLAGS = $(LDFLAGS_ac)
 
+AM_TESTS_ENVIRONMENT = $(TESTS_ENVIRONMENT_ac)
+
 if USE_COVERAGE
   AM_CFLAGS += --coverage
 endif
diff --git a/src/testzzuf/Makefile.am b/src/testzzuf/Makefile.am
index db85c679..d82d04e4 100644
--- a/src/testzzuf/Makefile.am
+++ b/src/testzzuf/Makefile.am
@@ -4,12 +4,14 @@ SUBDIRS  = .
 AM_CPPFLAGS = \
   -I$(top_srcdir)/src/include \
   -DMHD_CPU_COUNT=$(CPU_COUNT) \
-  $(LIBCURL_CPPFLAGS)
+  $(CPPFLAGS_ac) $(LIBCURL_CPPFLAGS)
 
 AM_CFLAGS = $(CFLAGS_ac) @LIBGCRYPT_CFLAGS@
 
 AM_LDFLAGS = $(LDFLAGS_ac)
 
+AM_TESTS_ENVIRONMENT = $(TESTS_ENVIRONMENT_ac)
+
 if USE_COVERAGE
   AM_CFLAGS += -fprofile-arcs -ftest-coverage
 endif

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