[libmicrohttpd] branch master updated (ee8a044e -> b5bf6ccf)

[gnunet]

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

karlson2k pushed a change to branch master
in repository libmicrohttpd.

    from ee8a044e Updated .gitignore
     new 7acc854b configure: updated gettext version to match version used in 
macros
     new c7cbc6cf configure: use proper quoting
     new 8f66b6e0 testcurl/Makefile.am: minor fixes
     new b5bf6ccf configure: added '--enable-heavy-tests'

The 4 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             | 22 +++++++++++++++-------
 src/testcurl/Makefile.am | 47 +++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 54 insertions(+), 15 deletions(-)

diff --git a/configure.ac b/configure.ac
index ce0be355..f3c0cde3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -88,7 +88,7 @@ m4_ifdef([AM_GNU_GETTEXT], [
 ])
 m4_ifdef([AM_GNU_GETTEXT_VERSION], [
 #do not indent here
-AM_GNU_GETTEXT_VERSION([0.19.8])
+AM_GNU_GETTEXT_VERSION([0.20.2])
 ])
 AM_CONDITIONAL([HAVE_PO], [ test "$have_po" = yes ])
 
@@ -97,8 +97,8 @@ AM_CONDITIONAL([HAVE_PO], [ test "$have_po" = yes ])
 
 # Adam shostack suggests the following for Windows:
 # -D_FORTIFY_SOURCE=2 -fstack-protector-all
-AC_ARG_ENABLE(gcc-hardening,
-   AS_HELP_STRING(--enable-gcc-hardening, enable compiler security checks),
+AC_ARG_ENABLE([gcc-hardening],
+   [AS_HELP_STRING([--enable-gcc-hardening], [enable compiler security 
checks])],
 [AS_IF([test x$enableval = xyes],[
     CFLAGS="$CFLAGS -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 
-fstack-protector-all"
     CFLAGS="$CFLAGS -fwrapv -fPIE -Wstack-protector"
@@ -108,14 +108,14 @@ AC_ARG_ENABLE(gcc-hardening,
 
 # Linker hardening options
 # Currently these options are ELF specific - you can't use this with MacOSX
-AC_ARG_ENABLE(linker-hardening,
-  AS_HELP_STRING(--enable-linker-hardening, enable linker security fixups),
+AC_ARG_ENABLE([linker-hardening],
+  [AS_HELP_STRING([--enable-linker-hardening], [enable linker security 
fixups])],
 [AS_IF([test x$enableval = xyes],
    [LDFLAGS="$LDFLAGS -z relro -z now"])])
 
 
-AC_ARG_ENABLE(sanitizer,
-  AS_HELP_STRING(--enable-sanitizer, enable Address Sanitizer and Undefined 
Behavior Sanitizer),
+AC_ARG_ENABLE([sanitizer],
+  [AS_HELP_STRING([--enable-sanitizer], [enable Address Sanitizer and 
Undefined Behavior Sanitizer])],
 [AS_IF([test x$enableval = xyes],[
    LDFLAGS="$CFLAGS -fsanitize=address,undefined -fno-omit-frame-pointer"
  ])])
@@ -933,6 +933,14 @@ AC_ARG_ENABLE([[examples]],
 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:] 
+  [a dedicated host with minimal number of background processes and no network]
+  [activity is recommended to enable.])], [],
+    [enable_heavy_tests=no])
+AS_VAR_IF([enable_heavy_tests], ["yes"], [], [enable_heavy_tests=no])
+AM_CONDITIONAL([HEAVY_TESTS],[test "x$enable_heavy_tests" = "xyes"])
+
 AC_ARG_ENABLE([[poll]],
   [AS_HELP_STRING([[--enable-poll[=ARG]]], [enable poll support (yes, no, 
auto) [auto]])],
     [enable_poll=${enableval}],
diff --git a/src/testcurl/Makefile.am b/src/testcurl/Makefile.am
index ac5830eb..78f2a076 100644
--- a/src/testcurl/Makefile.am
+++ b/src/testcurl/Makefile.am
@@ -1,5 +1,7 @@
 # This Makefile.am is in the public domain
-SUBDIRS  = .
+EMPTY_ITEM =
+
+SUBDIRS = .
 
 if USE_COVERAGE
   AM_CFLAGS = -fprofile-arcs -ftest-coverage
@@ -23,15 +25,35 @@ THREAD_ONLY_TESTS = \
   test_long_header11 \
   test_iplimit11 \
   test_termination \
+  $(EMPTY_ITEM)
+
+if HEAVY_TESTS
+THREAD_ONLY_TESTS += \
   test_add_conn_cleanup \
   test_add_conn_cleanup_nolisten \
-  test_timeout
+  $(EMPTY_ITEM)
+endif
+
+THREAD_ONLY_TESTS += \
+  test_timeout \
+  $(EMPTY_ITEM)
 
 if HAVE_POSIX_THREADS
+if HEAVY_TESTS
 THREAD_ONLY_TESTS += \
   perf_get_concurrent11 \
+  $(EMPTY_ITEM)
+endif
+
+THREAD_ONLY_TESTS += \
   test_quiesce \
-  test_concurrent_stop
+  $(EMPTY_ITEM)
+
+if HEAVY_TESTS
+THREAD_ONLY_TESTS += \
+  test_concurrent_stop \
+  $(EMPTY_ITEM)
+endif
 
 if HAVE_CURL_BINARY
 THREAD_ONLY_TESTS += \
@@ -40,17 +62,19 @@ endif
 endif
 
 if ENABLE_DAUTH
-  THREAD_ONLY_TESTS += \
-    test_digestauth \
-    test_digestauth_sha256 \
-    test_digestauth_with_arguments
+THREAD_ONLY_TESTS += \
+  test_digestauth \
+  test_digestauth_sha256 \
+  test_digestauth_with_arguments
 endif
 
+if HEAVY_TESTS
 if HAVE_POSIX_THREADS
 THREAD_ONLY_TESTS += \
   perf_get_concurrent
 endif
-  
+endif
+
 if HAVE_CURL
 check_PROGRAMS = \
   test_get \
@@ -73,7 +97,12 @@ check_PROGRAMS = \
   test_get_chunked \
   test_put_chunked \
   test_callback \
+  $(EMPTY_ITEM)
+
+if HEAVY_TESTS
+check_PROGRAMS += \
   perf_get
+endif
 
 if HAVE_POSTPROCESSOR
  check_PROGRAMS += \
@@ -85,11 +114,13 @@ if HAVE_POSTPROCESSOR
   test_post_loop11
 endif
 
+if HEAVY_TESTS
 if HAVE_FORK_WAITPID
 if HAVE_CURL_BINARY
 check_PROGRAMS += test_get_response_cleanup
 endif
 endif
+endif
 
 if USE_POSIX_THREADS
 check_PROGRAMS += \

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