aboutsummaryrefslogtreecommitdiff
path: root/src/testcurl
diff options
context:
space:
mode:
authorEvgeny Grin (Karlson2k) <k2k@narod.ru>2017-10-29 23:36:00 +0300
committerEvgeny Grin (Karlson2k) <k2k@narod.ru>2017-10-29 23:36:00 +0300
commit21ce9bfad3b5537cf0da7b4764a03b4a80dfd48f (patch)
tree37d8aefcf0065704b830ea180114a59db6b80378 /src/testcurl
parenta4320556aa74cab71188150015153bd0cb663616 (diff)
downloadlibmicrohttpd-21ce9bfad3b5537cf0da7b4764a03b4a80dfd48f.tar.gz
libmicrohttpd-21ce9bfad3b5537cf0da7b4764a03b4a80dfd48f.zip
Make testsuite compatible with W32 again
Diffstat (limited to 'src/testcurl')
-rw-r--r--src/testcurl/https/test_empty_response.c8
-rw-r--r--src/testcurl/https/test_https_get_select.c8
-rw-r--r--src/testcurl/perf_get.c6
-rw-r--r--src/testcurl/perf_get_concurrent.c18
-rw-r--r--src/testcurl/test_callback.c10
-rw-r--r--src/testcurl/test_delete.c10
-rw-r--r--src/testcurl/test_get.c6
-rw-r--r--src/testcurl/test_get_chunked.c6
-rw-r--r--src/testcurl/test_get_sendfile.c6
-rw-r--r--src/testcurl/test_large_put.c6
-rw-r--r--src/testcurl/test_parse_cookies.c6
-rw-r--r--src/testcurl/test_post.c6
-rw-r--r--src/testcurl/test_postform.c6
-rw-r--r--src/testcurl/test_process_arguments.c6
-rw-r--r--src/testcurl/test_process_headers.c6
-rw-r--r--src/testcurl/test_put.c6
-rw-r--r--src/testcurl/test_put_chunked.c6
-rw-r--r--src/testcurl/test_quiesce.c12
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 ()
172 { 172 {
173#ifdef MHD_POSIX_SOCKETS 173#ifdef MHD_POSIX_SOCKETS
174 if (EINTR != errno) 174 if (EINTR != errno)
175#endif /* MHD_POSIX_SOCKETS */
176 abort (); 175 abort ();
176#else
177 if (WSAEINVAL != WSAGetLastError() || 0 != rs.fd_count || 0 != ws.fd_count || 0 != es.fd_count)
178 abort ();
179 Sleep (1000);
180#endif
177 } 181 }
178 } 182 }
183 else
184 sleep (1000);
179 curl_multi_perform (multi, &running); 185 curl_multi_perform (multi, &running);
180 if (running == 0) 186 if (running == 0)
181 { 187 {
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)
198 { 198 {
199#ifdef MHD_POSIX_SOCKETS 199#ifdef MHD_POSIX_SOCKETS
200 if (EINTR != errno) 200 if (EINTR != errno)
201#endif /* MHD_POSIX_SOCKETS */
202 abort (); 201 abort ();
202#else
203 if (WSAEINVAL != WSAGetLastError() || 0 != rs.fd_count || 0 != ws.fd_count || 0 != es.fd_count)
204 abort ();
205 Sleep (1000);
206#endif
203 } 207 }
204 } 208 }
209 else
210 sleep (1000);
205 curl_multi_perform (multi, &running); 211 curl_multi_perform (multi, &running);
206 if (running == 0) 212 if (running == 0)
207 { 213 {
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)
497 tv.tv_usec = 1000; 497 tv.tv_usec = 1000;
498 if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv)) 498 if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv))
499 { 499 {
500#ifdef MHD_POSIX_SOCKETS
500 if (EINTR != errno) 501 if (EINTR != errno)
501 abort (); 502 abort ();
503#else
504 if (WSAEINVAL != WSAGetLastError() || 0 != rs.fd_count || 0 != ws.fd_count || 0 != es.fd_count)
505 abort ();
506 Sleep (1000);
507#endif
502 } 508 }
503 curl_multi_perform (multi, &running); 509 curl_multi_perform (multi, &running);
504 if (running == 0) 510 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)
416 tv.tv_usec = 1000 * (tt % 1000); 416 tv.tv_usec = 1000 * (tt % 1000);
417 if (-1 == select (max + 1, &rs, &ws, &es, &tv)) 417 if (-1 == select (max + 1, &rs, &ws, &es, &tv))
418 { 418 {
419 if (EINTR == errno) 419#ifdef MHD_POSIX_SOCKETS
420 continue; 420 if (EINTR == errno)
421 fprintf (stderr, 421 continue;
422 "select failed: %s\n", 422 fprintf (stderr,
423 strerror (errno)); 423 "select failed: %s\n",
424 strerror (errno));
425#else
426 if (WSAEINVAL == WSAGetLastError() && 0 == rs.fd_count && 0 == ws.fd_count && 0 == es.fd_count)
427 {
428 Sleep (1000);
429 continue;
430 }
431#endif
424 ret |= 1024; 432 ret |= 1024;
425 break; 433 break;
426 } 434 }
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)
199 tv.tv_usec = 1000; 199 tv.tv_usec = 1000;
200 if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv)) 200 if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv))
201 { 201 {
202 if (EINTR != errno) 202#ifdef MHD_POSIX_SOCKETS
203 abort (); 203 if (EINTR != errno)
204 abort ();
205#else
206 if (WSAEINVAL != WSAGetLastError() || 0 != rs.fd_count || 0 != ws.fd_count || 0 != es.fd_count)
207 abort ();
208 Sleep (1000);
209#endif
204 } 210 }
205 if (NULL != multi) 211 if (NULL != multi)
206 { 212 {
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 ()
454 tv.tv_usec = 1000; 454 tv.tv_usec = 1000;
455 if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv)) 455 if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv))
456 { 456 {
457 if (EINTR != errno) 457#ifdef MHD_POSIX_SOCKETS
458 abort (); 458 if (EINTR != errno)
459 abort ();
460#else
461 if (WSAEINVAL != WSAGetLastError() || 0 != rs.fd_count || 0 != ws.fd_count || 0 != es.fd_count)
462 abort ();
463 Sleep (1000);
464#endif
459 } 465 }
460 curl_multi_perform (multi, &running); 466 curl_multi_perform (multi, &running);
461 if (running == 0) 467 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 ()
428 tv.tv_usec = 1000; 428 tv.tv_usec = 1000;
429 if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv)) 429 if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv))
430 { 430 {
431#ifdef MHD_POSIX_SOCKETS
431 if (EINTR != errno) 432 if (EINTR != errno)
432 abort (); 433 abort ();
434#else
435 if (WSAEINVAL != WSAGetLastError() || 0 != rs.fd_count || 0 != ws.fd_count || 0 != es.fd_count)
436 abort ();
437 Sleep (1000);
438#endif
433 } 439 }
434 curl_multi_perform (multi, &running); 440 curl_multi_perform (multi, &running);
435 if (running == 0) 441 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 ()
450 tv.tv_usec = 1000; 450 tv.tv_usec = 1000;
451 if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv)) 451 if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv))
452 { 452 {
453#ifdef MHD_POSIX_SOCKETS
453 if (EINTR != errno) 454 if (EINTR != errno)
454 abort (); 455 abort ();
456#else
457 if (WSAEINVAL != WSAGetLastError() || 0 != rs.fd_count || 0 != ws.fd_count || 0 != es.fd_count)
458 abort ();
459 Sleep (1000);
460#endif
455 } 461 }
456 curl_multi_perform (multi, &running); 462 curl_multi_perform (multi, &running);
457 if (running == 0) 463 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 ()
433 tv.tv_usec = 1000; 433 tv.tv_usec = 1000;
434 if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv)) 434 if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv))
435 { 435 {
436#ifdef MHD_POSIX_SOCKETS
436 if (EINTR != errno) 437 if (EINTR != errno)
437 abort (); 438 abort ();
439#else
440 if (WSAEINVAL != WSAGetLastError() || 0 != rs.fd_count || 0 != ws.fd_count || 0 != es.fd_count)
441 abort ();
442 Sleep (1000);
443#endif
438 } 444 }
439 curl_multi_perform (multi, &running); 445 curl_multi_perform (multi, &running);
440 if (running == 0) 446 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)
540 tv.tv_usec = 1000; 540 tv.tv_usec = 1000;
541 if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv)) 541 if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv))
542 { 542 {
543#ifdef MHD_POSIX_SOCKETS
543 if (EINTR != errno) 544 if (EINTR != errno)
544 abort (); 545 abort ();
546#else
547 if (WSAEINVAL != WSAGetLastError() || 0 != rs.fd_count || 0 != ws.fd_count || 0 != es.fd_count)
548 abort ();
549 Sleep (1000);
550#endif
545 } 551 }
546 curl_multi_perform (multi, &running); 552 curl_multi_perform (multi, &running);
547 if (running == 0) 553 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 ()
221 tv.tv_usec = 1000; 221 tv.tv_usec = 1000;
222 if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv)) 222 if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv))
223 { 223 {
224#ifdef MHD_POSIX_SOCKETS
224 if (EINTR != errno) 225 if (EINTR != errno)
225 abort (); 226 abort ();
227#else
228 if (WSAEINVAL != WSAGetLastError() || 0 != rs.fd_count || 0 != ws.fd_count || 0 != es.fd_count)
229 abort ();
230 Sleep (1000);
231#endif
226 } 232 }
227 curl_multi_perform (multi, &running); 233 curl_multi_perform (multi, &running);
228 if (running == 0) 234 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 ()
495 tv.tv_usec = 1000; 495 tv.tv_usec = 1000;
496 if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv)) 496 if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv))
497 { 497 {
498#ifdef MHD_POSIX_SOCKETS
498 if (EINTR != errno) 499 if (EINTR != errno)
499 abort (); 500 abort ();
501#else
502 if (WSAEINVAL != WSAGetLastError() || 0 != rs.fd_count || 0 != ws.fd_count || 0 != es.fd_count)
503 abort ();
504 Sleep (1000);
505#endif
500 } 506 }
501 curl_multi_perform (multi, &running); 507 curl_multi_perform (multi, &running);
502 if (running == 0) 508 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 ()
519 tv.tv_usec = 1000; 519 tv.tv_usec = 1000;
520 if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv)) 520 if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv))
521 { 521 {
522#ifdef MHD_POSIX_SOCKETS
522 if (EINTR != errno) 523 if (EINTR != errno)
523 abort (); 524 abort ();
525#else
526 if (WSAEINVAL != WSAGetLastError() || 0 != rs.fd_count || 0 != ws.fd_count || 0 != es.fd_count)
527 abort ();
528 Sleep (1000);
529#endif
524 } 530 }
525 curl_multi_perform (multi, &running); 531 curl_multi_perform (multi, &running);
526 if (running == 0) 532 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 ()
221 tv.tv_usec = 1000; 221 tv.tv_usec = 1000;
222 if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv)) 222 if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv))
223 { 223 {
224#ifdef MHD_POSIX_SOCKETS
224 if (EINTR != errno) 225 if (EINTR != errno)
225 abort (); 226 abort ();
227#else
228 if (WSAEINVAL != WSAGetLastError() || 0 != rs.fd_count || 0 != ws.fd_count || 0 != es.fd_count)
229 abort ();
230 Sleep (1000);
231#endif
226 } 232 }
227 curl_multi_perform (multi, &running); 233 curl_multi_perform (multi, &running);
228 if (running == 0) 234 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 ()
464 tv.tv_usec = 1000; 464 tv.tv_usec = 1000;
465 if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv)) 465 if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv))
466 { 466 {
467#ifdef MHD_POSIX_SOCKETS
467 if (EINTR != errno) 468 if (EINTR != errno)
468 abort (); 469 abort ();
470#else
471 if (WSAEINVAL != WSAGetLastError() || 0 != rs.fd_count || 0 != ws.fd_count || 0 != es.fd_count)
472 abort ();
473 Sleep (1000);
474#endif
469 } 475 }
470 curl_multi_perform (multi, &running); 476 curl_multi_perform (multi, &running);
471 if (running == 0) 477 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, &copyBuffer);
465 tv.tv_usec = 1000; 465 tv.tv_usec = 1000;
466 if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv)) 466 if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv))
467 { 467 {
468#ifdef MHD_POSIX_SOCKETS
468 if (EINTR != errno) 469 if (EINTR != errno)
469 abort (); 470 abort ();
471#else
472 if (WSAEINVAL != WSAGetLastError() || 0 != rs.fd_count || 0 != ws.fd_count || 0 != es.fd_count)
473 abort ();
474 Sleep (1000);
475#endif
470 } 476 }
471 curl_multi_perform (multi, &running); 477 curl_multi_perform (multi, &running);
472 if (running == 0) 478 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 ()
459 tv.tv_usec = 1000; 459 tv.tv_usec = 1000;
460 if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv)) 460 if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv))
461 { 461 {
462#ifdef MHD_POSIX_SOCKETS
462 if (EINTR != errno) 463 if (EINTR != errno)
463 abort (); 464 abort ();
465#else
466 if (WSAEINVAL != WSAGetLastError() || 0 != rs.fd_count || 0 != ws.fd_count || 0 != es.fd_count)
467 abort ();
468 Sleep (1000);
469#endif
464 } 470 }
465 curl_multi_perform (multi, &running); 471 curl_multi_perform (multi, &running);
466 if (running == 0) 472 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)
151 tv.tv_usec = 1000; 151 tv.tv_usec = 1000;
152 if (-1 == MHD_SYS_select_ (max + 1, &rs, &ws, &es, &tv)) 152 if (-1 == MHD_SYS_select_ (max + 1, &rs, &ws, &es, &tv))
153 { 153 {
154#ifdef MHD_POSIX_SOCKETS
154 if (EINTR != errno) 155 if (EINTR != errno)
155 abort (); 156 abort ();
157#else
158 if (WSAEINVAL != WSAGetLastError() || 0 != rs.fd_count || 0 != ws.fd_count || 0 != es.fd_count)
159 abort ();
160 Sleep (1000);
161#endif
156 } 162 }
157 MHD_run (d); 163 MHD_run (d);
158 } 164 }
@@ -432,8 +438,14 @@ testExternalGet ()
432 tv.tv_usec = 1000; 438 tv.tv_usec = 1000;
433 if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv)) 439 if (-1 == select (maxposixs + 1, &rs, &ws, &es, &tv))
434 { 440 {
441#ifdef MHD_POSIX_SOCKETS
435 if (EINTR != errno) 442 if (EINTR != errno)
436 abort (); 443 abort ();
444#else
445 if (WSAEINVAL != WSAGetLastError() || 0 != rs.fd_count || 0 != ws.fd_count || 0 != es.fd_count)
446 abort ();
447 Sleep (1000);
448#endif
437 } 449 }
438 curl_multi_perform (multi, &running); 450 curl_multi_perform (multi, &running);
439 if (0 == running) 451 if (0 == running)
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-20 13:38:36 +0000