diff options
Diffstat (limited to 'tests/libtest')
| -rw-r--r-- | tests/libtest/Makefile.inc | 6 | ||||
| -rw-r--r-- | tests/libtest/lib536.c | 142 |
2 files changed, 1 insertions, 147 deletions
diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc index e38f48102..4ba279452 100644 --- a/tests/libtest/Makefile.inc +++ b/tests/libtest/Makefile.inc @@ -16,7 +16,7 @@ noinst_PROGRAMS = chkhostname libauthretry libntlmconnect \ lib500 lib501 lib502 lib503 lib504 lib505 lib506 lib507 lib508 lib509 \ lib510 lib511 lib512 lib513 lib514 lib515 lib516 lib517 lib518 lib519 \ lib520 lib521 lib523 lib524 lib525 lib526 lib527 lib529 lib530 lib532 \ - lib533 lib536 lib537 lib539 lib540 lib541 lib542 lib543 lib544 lib545 \ + lib533 lib537 lib539 lib540 lib541 lib542 lib543 lib544 lib545 \ lib547 lib548 lib549 lib552 lib553 lib554 lib555 lib556 lib557 lib558 \ lib559 lib560 lib562 lib564 lib565 lib566 lib567 lib568 lib569 lib570 \ lib571 lib572 lib573 lib574 lib575 lib576 lib578 lib579 lib582 \ @@ -160,10 +160,6 @@ lib533_SOURCES = lib533.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) lib533_LDADD = $(TESTUTIL_LIBS) lib533_CPPFLAGS = $(AM_CPPFLAGS) -lib536_SOURCES = lib536.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS) -lib536_LDADD = $(TESTUTIL_LIBS) -lib536_CPPFLAGS = $(AM_CPPFLAGS) - lib537_SOURCES = lib537.c $(SUPPORTFILES) $(WARNLESS) lib537_CPPFLAGS = $(AM_CPPFLAGS) diff --git a/tests/libtest/lib536.c b/tests/libtest/lib536.c deleted file mode 100644 index e6943626d..000000000 --- a/tests/libtest/lib536.c +++ /dev/null @@ -1,142 +0,0 @@ -/*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ - * \___|\___/|_| \_\_____| - * - * Copyright (C) 1998 - 2011, 2017, Daniel Stenberg, <daniel@haxx.se>, et al. - * - * This software is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at https://curl.haxx.se/docs/copyright.html. - * - * You may opt to use, copy, modify, merge, publish, distribute and/or sell - * copies of the Software, and permit persons to whom the Software is - * furnished to do so, under the terms of the COPYING file. - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY - * KIND, either express or implied. - * - ***************************************************************************/ -#include "test.h" - -#include <fcntl.h> - -#include "testutil.h" -#include "warnless.h" -#include "memdebug.h" - -#define TEST_HANG_TIMEOUT 60 * 1000 - -static int perform(CURLM *multi) -{ - int handles; - fd_set fdread, fdwrite, fdexcep; - int res = 0; - - for(;;) { - struct timeval interval; - int maxfd = -99; - - interval.tv_sec = 0; - interval.tv_usec = 100000L; /* 100 ms */ - - res_multi_perform(multi, &handles); - if(res) - return res; - - res_test_timedout(); - if(res) - return res; - - if(!handles) - break; /* done */ - - FD_ZERO(&fdread); - FD_ZERO(&fdwrite); - FD_ZERO(&fdexcep); - - res_multi_fdset(multi, &fdread, &fdwrite, &fdexcep, &maxfd); - if(res) - return res; - - /* At this point, maxfd is guaranteed to be greater or equal than -1. */ - - res_select_test(maxfd + 1, &fdread, &fdwrite, &fdexcep, &interval); - if(res) - return res; - - res_test_timedout(); - if(res) - return res; - } - - return 0; /* success */ -} - -int test(char *URL) -{ - CURLM *multi = NULL; - CURL *easy = NULL; - int res = 0; - - start_test_timing(); - - global_init(CURL_GLOBAL_ALL); - - multi_init(multi); - - easy_init(easy); - - multi_setopt(multi, CURLMOPT_PIPELINING, 1L); - - easy_setopt(easy, CURLOPT_WRITEFUNCTION, fwrite); - easy_setopt(easy, CURLOPT_FAILONERROR, 1L); - easy_setopt(easy, CURLOPT_URL, URL); - - res_multi_add_handle(multi, easy); - if(res) { - printf("curl_multi_add_handle() 1 failed\n"); - goto test_cleanup; - } - - res = perform(multi); - if(res) { - printf("retrieve 1 failed\n"); - goto test_cleanup; - } - - curl_multi_remove_handle(multi, easy); - - curl_easy_reset(easy); - - easy_setopt(easy, CURLOPT_FAILONERROR, 1L); - easy_setopt(easy, CURLOPT_URL, libtest_arg2); - - res_multi_add_handle(multi, easy); - if(res) { - printf("curl_multi_add_handle() 2 failed\n"); - goto test_cleanup; - } - - res = perform(multi); - if(res) { - printf("retrieve 2 failed\n"); - goto test_cleanup; - } - - curl_multi_remove_handle(multi, easy); - -test_cleanup: - - /* undocumented cleanup sequence - type UB */ - - curl_easy_cleanup(easy); - curl_multi_cleanup(multi); - curl_global_cleanup(); - - printf("Finished!\n"); - - return res; -} |