[GNUnet-SVN] [libmicrohttpd] branch master updated: test-suite: fixed tests on Cygwin

[gnunet]

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

karlson2k pushed a commit to branch master
in repository libmicrohttpd.

The following commit(s) were added to refs/heads/master by this push:
     new bb9fdec1 test-suite: fixed tests on Cygwin
bb9fdec1 is described below

commit bb9fdec12ee0ace4672311ad6a23dd421a6c012f
Author: Evgeny Grin (Karlson2k) <address@hidden>
AuthorDate: Sun Nov 26 14:49:15 2017 +0300

    test-suite: fixed tests on Cygwin
---
 configure.ac               | 3 +++
 src/microhttpd/Makefile.am | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/configure.ac b/configure.ac
index 47ffbd38..9174fa4a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -346,6 +346,9 @@ gnu*)
 ;;
 esac
 
+AM_CONDITIONAL([CYGWIN_TARGET], [[test "x$os_is_windows" = "xyes" && \
+                                  test "x${os_is_native_w32}" != "xyes"]])
+
 AC_ARG_WITH([threads],
    [AS_HELP_STRING([--with-threads=LIB],[choose threading library (posix, w32, 
auto) [auto]])],
    [], [with_threads='auto'])
diff --git a/src/microhttpd/Makefile.am b/src/microhttpd/Makefile.am
index 0f2672de..d89f3c19 100644
--- a/src/microhttpd/Makefile.am
+++ b/src/microhttpd/Makefile.am
@@ -166,6 +166,10 @@ endif
 
 TESTS = $(check_PROGRAMS)
 
+# Do not test trigger of select by shutdown of listen socket
+# on Cygwin as this ability is deliberately ignored on Cygwin
+# to improve compatibility with core OS.
+if !CYGWIN_TARGET
 if HAVE_LISTEN_SHUTDOWN
 check_PROGRAMS += \
   test_shutdown_select \
@@ -175,6 +179,7 @@ check_PROGRAMS += \
   test_shutdown_select_ignore \
   test_shutdown_poll_ignore
 endif
+endif
 
 test_start_stop_SOURCES = \
   test_start_stop.c

-- 
To stop receiving notification emails like this one, please contact
address@hidden