[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [libmicrohttpd] branch master updated: test_shutdown_select
From: |
gnunet |
Subject: |
[GNUnet-SVN] [libmicrohttpd] branch master updated: test_shutdown_select/test_shutdown_poll: conditionally use test_shutdown_*_ignore to avoid XFAIL results |
Date: |
Sun, 25 Jun 2017 21:31:48 +0200 |
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 4b3c7d9e test_shutdown_select/test_shutdown_poll: conditionally use
test_shutdown_*_ignore to avoid XFAIL results
4b3c7d9e is described below
commit 4b3c7d9e4251baa4812255f388b4b3d51b78a84b
Author: Evgeny Grin (Karlson2k) <address@hidden>
AuthorDate: Sun Jun 25 22:31:35 2017 +0300
test_shutdown_select/test_shutdown_poll: conditionally use
test_shutdown_*_ignore to avoid XFAIL results
---
src/microhttpd/Makefile.am | 28 ++++++++++++++++++++++++----
src/microhttpd/test_shutdown_select.c | 4 +++-
2 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/src/microhttpd/Makefile.am b/src/microhttpd/Makefile.am
index 5ae900ac..48a72b43 100644
--- a/src/microhttpd/Makefile.am
+++ b/src/microhttpd/Makefile.am
@@ -144,8 +144,6 @@ check_PROGRAMS = \
test_str_to_value \
test_str_token \
test_http_reasons \
- test_shutdown_select \
- test_shutdown_poll \
test_daemon
if HAVE_POSIX_THREADS
@@ -166,10 +164,14 @@ endif
TESTS = $(check_PROGRAMS)
-if !HAVE_LISTEN_SHUTDOWN
-XFAIL_TESTS = \
+if HAVE_LISTEN_SHUTDOWN
+check_PROGRAMS += \
test_shutdown_select \
test_shutdown_poll
+else
+check_PROGRAMS += \
+ test_shutdown_select_ignore \
+ test_shutdown_poll_ignore
endif
test_daemon_SOURCES = \
@@ -246,6 +248,24 @@ test_shutdown_poll_LDADD = \
$(PTHREAD_LIBS)
endif
+test_shutdown_select_ignore_SOURCES = \
+ test_shutdown_select.c
+if USE_POSIX_THREADS
+test_shutdown_select_ignore_CFLAGS = \
+ $(AM_CFLAGS) $(PTHREAD_CFLAGS)
+test_shutdown_select_ignore_LDADD = \
+ $(PTHREAD_LIBS)
+endif
+
+test_shutdown_poll_ignore_SOURCES = \
+ test_shutdown_select.c mhd_threads.h
+if USE_POSIX_THREADS
+test_shutdown_poll_ignore_CFLAGS = \
+ $(AM_CFLAGS) $(PTHREAD_CFLAGS)
+test_shutdown_poll_ignore_LDADD = \
+ $(PTHREAD_LIBS)
+endif
+
test_str_compare_SOURCES = \
test_str.c test_helpers.h mhd_str.c
diff --git a/src/microhttpd/test_shutdown_select.c
b/src/microhttpd/test_shutdown_select.c
index 8d779dbd..e3cd0249 100644
--- a/src/microhttpd/test_shutdown_select.c
+++ b/src/microhttpd/test_shutdown_select.c
@@ -285,8 +285,10 @@ main (int argc, char *const *argv)
int err;
#endif /* MHD_WINSOCK_SOCKETS */
bool test_poll;
+ bool must_ignore;
test_poll = has_in_name(argv[0], "_poll");
+ must_ignore = has_in_name(argv[0], "_ignore");
if (!test_poll)
test_func = &select_thread;
else
@@ -379,5 +381,5 @@ main (int argc, char *const *argv)
WSACleanup();
#endif /* MHD_WINSOCK_SOCKETS */
- return result;
+ return must_ignore ? (!result) : (result);
}
--
To stop receiving notification emails like this one, please contact
address@hidden
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [libmicrohttpd] branch master updated: test_shutdown_select/test_shutdown_poll: conditionally use test_shutdown_*_ignore to avoid XFAIL results,
gnunet <=