[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [libmicrohttpd] 02/02: Make testsuite compatible with W32 a
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [libmicrohttpd] 02/02: Make testsuite compatible with W32 again |
|
Date: |
Sun, 29 Oct 2017 21:36:43 +0100 |
This is an automated email from the git hooks/post-receive script.
karlson2k pushed a commit to branch master
in repository libmicrohttpd.
commit 21ce9bfad3b5537cf0da7b4764a03b4a80dfd48f
Author: Evgeny Grin (Karlson2k) <address@hidden>
AuthorDate: Sun Oct 29 23:36:00 2017 +0300
Make testsuite compatible with W32 again
---
src/testcurl/https/test_empty_response.c | 8 +++++++-
src/testcurl/https/test_https_get_select.c | 8 +++++++-
src/testcurl/perf_get.c | 6 ++++++
src/testcurl/perf_get_concurrent.c | 18 +++++++++++++-----
src/testcurl/test_callback.c | 10 ++++++++--
src/testcurl/test_delete.c | 10 ++++++++--
src/testcurl/test_get.c | 6 ++++++
src/testcurl/test_get_chunked.c | 6 ++++++
src/testcurl/test_get_sendfile.c | 6 ++++++
src/testcurl/test_large_put.c | 6 ++++++
src/testcurl/test_parse_cookies.c | 6 ++++++
src/testcurl/test_post.c | 6 ++++++
src/testcurl/test_postform.c | 6 ++++++
src/testcurl/test_process_arguments.c | 6 ++++++
src/testcurl/test_process_headers.c | 6 ++++++
src/testcurl/test_put.c | 6 ++++++
src/testcurl/test_put_chunked.c | 6 ++++++
src/testcurl/test_quiesce.c | 12 ++++++++++++
18 files changed, 127 insertions(+), 11 deletions(-)
diff --git a/src/testcurl/https/test_empty_response.c
b/src/testcurl/https/test_empty_response.c
index 70baf832..09da489d 100644
--- a/src/testcurl/https/test_empty_response.c
+++ b/src/testcurl/https/test_empty_response.c
@@ -172,10 +172,16 @@ testInternalSelectGet ()
{
#ifdef MHD_POSIX_SOCKETS
if (EINTR != errno)
-#endif /* MHD_POSIX_SOCKETS */
abort ();
+#else
+ if (WSAEINVAL != WSAGetLastError() || 0 != rs.fd_count || 0 !=
ws.fd_count || 0 != es.fd_count)
+ abort ();
+ Sleep (1000);
+#endif
}
}
+ else
+ sleep (1000);
curl_multi_perform (multi, &running);
if (running == 0)
{
diff --git a/src/testcurl/https/test_https_get_select.c
b/src/testcurl/https/test_https_get_select.c
index df19396e..f76fbad0 100644
--- a/src/testcurl/https/test_https_get_select.c
+++ b/src/testcurl/https/test_https_get_select.c
@@ -198,10 +198,16 @@ testExternalGet (int flags)
{
#ifdef MHD_POSIX_SOCKETS
if (EINTR != errno)
-#endif /* MHD_POSIX_SOCKETS */
abort ();
+#else
+ if (WSAEINVAL != WSAGetLastError() || 0 != rs.fd_count || 0 !=
ws.fd_count || 0 != es.fd_count)
+ abort ();
+ Sleep (1000);
+#endif
}
}
+ else
+ sleep (1000);
curl_multi_perform (multi, &running);
if (running == 0)
{
diff --git a/src/testcurl/perf_get.c b/src/testcurl/perf_get.c
index 8e5902d8..d7ddc0e2 100644
--- a/src/testcurl/perf_get.c
+++ b/src/testcurl/perf_get.c
@@ -497,8 +497,14 @@ testExternalGet (int port)
tv.tv_usec = 1000;
if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv))
{
+#ifdef MHD_POSIX_SOCKETS
if (EINTR != errno)
abort ();
+#else
+ if (WSAEINVAL != WSAGetLastError() || 0 != rs.fd_count || 0 !=
ws.fd_count || 0 != es.fd_count)
+ abort ();
+ Sleep (1000);
+#endif
}
curl_multi_perform (multi, &running);
if (running == 0)
diff --git a/src/testcurl/perf_get_concurrent.c
b/src/testcurl/perf_get_concurrent.c
index d4bbf753..d234b720 100644
--- a/src/testcurl/perf_get_concurrent.c
+++ b/src/testcurl/perf_get_concurrent.c
@@ -416,11 +416,19 @@ testExternalGet (int port)
tv.tv_usec = 1000 * (tt % 1000);
if (-1 == select (max + 1, &rs, &ws, &es, &tv))
{
- if (EINTR == errno)
- continue;
- fprintf (stderr,
- "select failed: %s\n",
- strerror (errno));
+#ifdef MHD_POSIX_SOCKETS
+ if (EINTR == errno)
+ continue;
+ fprintf (stderr,
+ "select failed: %s\n",
+ strerror (errno));
+#else
+ if (WSAEINVAL == WSAGetLastError() && 0 == rs.fd_count && 0 ==
ws.fd_count && 0 == es.fd_count)
+ {
+ Sleep (1000);
+ continue;
+ }
+#endif
ret |= 1024;
break;
}
diff --git a/src/testcurl/test_callback.c b/src/testcurl/test_callback.c
index 9c9e125f..b7dc9fe8 100644
--- a/src/testcurl/test_callback.c
+++ b/src/testcurl/test_callback.c
@@ -199,8 +199,14 @@ main(int argc, char **argv)
tv.tv_usec = 1000;
if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv))
{
- if (EINTR != errno)
- abort ();
+#ifdef MHD_POSIX_SOCKETS
+ if (EINTR != errno)
+ abort ();
+#else
+ if (WSAEINVAL != WSAGetLastError() || 0 != rs.fd_count || 0 !=
ws.fd_count || 0 != es.fd_count)
+ abort ();
+ Sleep (1000);
+#endif
}
if (NULL != multi)
{
diff --git a/src/testcurl/test_delete.c b/src/testcurl/test_delete.c
index 513a5ebd..1b4b8db0 100644
--- a/src/testcurl/test_delete.c
+++ b/src/testcurl/test_delete.c
@@ -454,8 +454,14 @@ testExternalDelete ()
tv.tv_usec = 1000;
if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv))
{
- if (EINTR != errno)
- abort ();
+#ifdef MHD_POSIX_SOCKETS
+ if (EINTR != errno)
+ abort ();
+#else
+ if (WSAEINVAL != WSAGetLastError() || 0 != rs.fd_count || 0 !=
ws.fd_count || 0 != es.fd_count)
+ abort ();
+ Sleep (1000);
+#endif
}
curl_multi_perform (multi, &running);
if (running == 0)
diff --git a/src/testcurl/test_get.c b/src/testcurl/test_get.c
index bc7f5fb5..2b4089e1 100644
--- a/src/testcurl/test_get.c
+++ b/src/testcurl/test_get.c
@@ -428,8 +428,14 @@ testExternalGet ()
tv.tv_usec = 1000;
if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv))
{
+#ifdef MHD_POSIX_SOCKETS
if (EINTR != errno)
abort ();
+#else
+ if (WSAEINVAL != WSAGetLastError() || 0 != rs.fd_count || 0 !=
ws.fd_count || 0 != es.fd_count)
+ abort ();
+ Sleep (1000);
+#endif
}
curl_multi_perform (multi, &running);
if (running == 0)
diff --git a/src/testcurl/test_get_chunked.c b/src/testcurl/test_get_chunked.c
index 2c6ec2d4..f698907c 100644
--- a/src/testcurl/test_get_chunked.c
+++ b/src/testcurl/test_get_chunked.c
@@ -450,8 +450,14 @@ testExternalGet ()
tv.tv_usec = 1000;
if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv))
{
+#ifdef MHD_POSIX_SOCKETS
if (EINTR != errno)
abort ();
+#else
+ if (WSAEINVAL != WSAGetLastError() || 0 != rs.fd_count || 0 !=
ws.fd_count || 0 != es.fd_count)
+ abort ();
+ Sleep (1000);
+#endif
}
curl_multi_perform (multi, &running);
if (running == 0)
diff --git a/src/testcurl/test_get_sendfile.c b/src/testcurl/test_get_sendfile.c
index 652423d4..de51e1d0 100644
--- a/src/testcurl/test_get_sendfile.c
+++ b/src/testcurl/test_get_sendfile.c
@@ -433,8 +433,14 @@ testExternalGet ()
tv.tv_usec = 1000;
if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv))
{
+#ifdef MHD_POSIX_SOCKETS
if (EINTR != errno)
abort ();
+#else
+ if (WSAEINVAL != WSAGetLastError() || 0 != rs.fd_count || 0 !=
ws.fd_count || 0 != es.fd_count)
+ abort ();
+ Sleep (1000);
+#endif
}
curl_multi_perform (multi, &running);
if (running == 0)
diff --git a/src/testcurl/test_large_put.c b/src/testcurl/test_large_put.c
index c6b3ae27..4dc16319 100644
--- a/src/testcurl/test_large_put.c
+++ b/src/testcurl/test_large_put.c
@@ -540,8 +540,14 @@ testPutExternal (void)
tv.tv_usec = 1000;
if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv))
{
+#ifdef MHD_POSIX_SOCKETS
if (EINTR != errno)
abort ();
+#else
+ if (WSAEINVAL != WSAGetLastError() || 0 != rs.fd_count || 0 !=
ws.fd_count || 0 != es.fd_count)
+ abort ();
+ Sleep (1000);
+#endif
}
curl_multi_perform (multi, &running);
if (running == 0)
diff --git a/src/testcurl/test_parse_cookies.c
b/src/testcurl/test_parse_cookies.c
index d04815d5..a406bd32 100644
--- a/src/testcurl/test_parse_cookies.c
+++ b/src/testcurl/test_parse_cookies.c
@@ -221,8 +221,14 @@ testExternalGet ()
tv.tv_usec = 1000;
if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv))
{
+#ifdef MHD_POSIX_SOCKETS
if (EINTR != errno)
abort ();
+#else
+ if (WSAEINVAL != WSAGetLastError() || 0 != rs.fd_count || 0 !=
ws.fd_count || 0 != es.fd_count)
+ abort ();
+ Sleep (1000);
+#endif
}
curl_multi_perform (multi, &running);
if (running == 0)
diff --git a/src/testcurl/test_post.c b/src/testcurl/test_post.c
index 41d219fa..91da9362 100644
--- a/src/testcurl/test_post.c
+++ b/src/testcurl/test_post.c
@@ -495,8 +495,14 @@ testExternalPost ()
tv.tv_usec = 1000;
if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv))
{
+#ifdef MHD_POSIX_SOCKETS
if (EINTR != errno)
abort ();
+#else
+ if (WSAEINVAL != WSAGetLastError() || 0 != rs.fd_count || 0 !=
ws.fd_count || 0 != es.fd_count)
+ abort ();
+ Sleep (1000);
+#endif
}
curl_multi_perform (multi, &running);
if (running == 0)
diff --git a/src/testcurl/test_postform.c b/src/testcurl/test_postform.c
index 9e771da9..cbb46413 100644
--- a/src/testcurl/test_postform.c
+++ b/src/testcurl/test_postform.c
@@ -519,8 +519,14 @@ testExternalPost ()
tv.tv_usec = 1000;
if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv))
{
+#ifdef MHD_POSIX_SOCKETS
if (EINTR != errno)
abort ();
+#else
+ if (WSAEINVAL != WSAGetLastError() || 0 != rs.fd_count || 0 !=
ws.fd_count || 0 != es.fd_count)
+ abort ();
+ Sleep (1000);
+#endif
}
curl_multi_perform (multi, &running);
if (running == 0)
diff --git a/src/testcurl/test_process_arguments.c
b/src/testcurl/test_process_arguments.c
index def5cd98..32200229 100644
--- a/src/testcurl/test_process_arguments.c
+++ b/src/testcurl/test_process_arguments.c
@@ -221,8 +221,14 @@ testExternalGet ()
tv.tv_usec = 1000;
if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv))
{
+#ifdef MHD_POSIX_SOCKETS
if (EINTR != errno)
abort ();
+#else
+ if (WSAEINVAL != WSAGetLastError() || 0 != rs.fd_count || 0 !=
ws.fd_count || 0 != es.fd_count)
+ abort ();
+ Sleep (1000);
+#endif
}
curl_multi_perform (multi, &running);
if (running == 0)
diff --git a/src/testcurl/test_process_headers.c
b/src/testcurl/test_process_headers.c
index db4aeb75..50d40839 100644
--- a/src/testcurl/test_process_headers.c
+++ b/src/testcurl/test_process_headers.c
@@ -464,8 +464,14 @@ testExternalGet ()
tv.tv_usec = 1000;
if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv))
{
+#ifdef MHD_POSIX_SOCKETS
if (EINTR != errno)
abort ();
+#else
+ if (WSAEINVAL != WSAGetLastError() || 0 != rs.fd_count || 0 !=
ws.fd_count || 0 != es.fd_count)
+ abort ();
+ Sleep (1000);
+#endif
}
curl_multi_perform (multi, &running);
if (running == 0)
diff --git a/src/testcurl/test_put.c b/src/testcurl/test_put.c
index f448c408..11768be8 100644
--- a/src/testcurl/test_put.c
+++ b/src/testcurl/test_put.c
@@ -465,8 +465,14 @@ curl_easy_setopt (c, CURLOPT_WRITEFUNCTION, ©Buffer);
tv.tv_usec = 1000;
if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv))
{
+#ifdef MHD_POSIX_SOCKETS
if (EINTR != errno)
abort ();
+#else
+ if (WSAEINVAL != WSAGetLastError() || 0 != rs.fd_count || 0 !=
ws.fd_count || 0 != es.fd_count)
+ abort ();
+ Sleep (1000);
+#endif
}
curl_multi_perform (multi, &running);
if (running == 0)
diff --git a/src/testcurl/test_put_chunked.c b/src/testcurl/test_put_chunked.c
index b7a7537c..f4c60aab 100644
--- a/src/testcurl/test_put_chunked.c
+++ b/src/testcurl/test_put_chunked.c
@@ -459,8 +459,14 @@ testExternalPut ()
tv.tv_usec = 1000;
if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv))
{
+#ifdef MHD_POSIX_SOCKETS
if (EINTR != errno)
abort ();
+#else
+ if (WSAEINVAL != WSAGetLastError() || 0 != rs.fd_count || 0 !=
ws.fd_count || 0 != es.fd_count)
+ abort ();
+ Sleep (1000);
+#endif
}
curl_multi_perform (multi, &running);
if (running == 0)
diff --git a/src/testcurl/test_quiesce.c b/src/testcurl/test_quiesce.c
index 59eea2d0..0063606f 100644
--- a/src/testcurl/test_quiesce.c
+++ b/src/testcurl/test_quiesce.c
@@ -151,8 +151,14 @@ ServeOneRequest(void *param)
tv.tv_usec = 1000;
if (-1 == MHD_SYS_select_ (max + 1, &rs, &ws, &es, &tv))
{
+#ifdef MHD_POSIX_SOCKETS
if (EINTR != errno)
abort ();
+#else
+ if (WSAEINVAL != WSAGetLastError() || 0 != rs.fd_count || 0 !=
ws.fd_count || 0 != es.fd_count)
+ abort ();
+ Sleep (1000);
+#endif
}
MHD_run (d);
}
@@ -432,8 +438,14 @@ testExternalGet ()
tv.tv_usec = 1000;
if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv))
{
+#ifdef MHD_POSIX_SOCKETS
if (EINTR != errno)
abort ();
+#else
+ if (WSAEINVAL != WSAGetLastError() || 0 != rs.fd_count || 0 !=
ws.fd_count || 0 != es.fd_count)
+ abort ();
+ Sleep (1000);
+#endif
}
curl_multi_perform (multi, &running);
if (0 == running)
--
To stop receiving notification emails like this one, please contact
address@hidden