diff options
Diffstat (limited to 'tests/libtest/lib525.c')
-rw-r--r-- | tests/libtest/lib525.c | 169 |
1 files changed, 55 insertions, 114 deletions
diff --git a/tests/libtest/lib525.c b/tests/libtest/lib525.c index f034050eb..ca128cb9c 100644 --- a/tests/libtest/lib525.c +++ b/tests/libtest/lib525.c @@ -21,45 +21,45 @@ ***************************************************************************/ #include "test.h" -#include <sys/types.h> -#include <sys/stat.h> #include <fcntl.h> #include "testutil.h" #include "warnless.h" #include "memdebug.h" -#define MAIN_LOOP_HANG_TIMEOUT 90 * 1000 -#define MULTI_PERFORM_HANG_TIMEOUT 60 * 1000 +#define TEST_HANG_TIMEOUT 60 * 1000 int test(char *URL) { int res = 0; - CURL *curl; - FILE *hd_src ; + CURL *curl = NULL; + FILE *hd_src = NULL; int hd ; int error; struct_stat file_info; - int running; - char done=FALSE; CURLM *m = NULL; - struct timeval ml_start; - struct timeval mp_start; - char ml_timedout = FALSE; - char mp_timedout = FALSE; + int running; + + start_test_timing(); - if (!libtest_arg2) { + if(!libtest_arg2) { +#ifdef LIB529 + /* test 529 */ + fprintf(stderr, "Usage: lib529 [url] [uploadfile]\n"); +#else + /* test 525 */ fprintf(stderr, "Usage: lib525 [url] [uploadfile]\n"); - return -1; +#endif + return TEST_ERR_USAGE; } hd_src = fopen(libtest_arg2, "rb"); if(NULL == hd_src) { error = ERRNO; - fprintf(stderr, "fopen() failed with error: %d %s\n", + fprintf(stderr, "fopen() failed with error: %d (%s)\n", error, strerror(error)); - fprintf(stderr, "Error opening file: %s\n", libtest_arg2); - return TEST_ERR_MAJOR_BAD; + fprintf(stderr, "Error opening file: (%s)\n", libtest_arg2); + return TEST_ERR_FOPEN; } /* get the file size of the local file */ @@ -67,40 +67,35 @@ int test(char *URL) if(hd == -1) { /* can't open file, bail out */ error = ERRNO; - fprintf(stderr, "fstat() failed with error: %d %s\n", + fprintf(stderr, "fstat() failed with error: %d (%s)\n", error, strerror(error)); - fprintf(stderr, "ERROR: cannot open file %s\n", libtest_arg2); + fprintf(stderr, "ERROR: cannot open file (%s)\n", libtest_arg2); fclose(hd_src); - return -1; + return TEST_ERR_FSTAT; } - if (curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) { - fprintf(stderr, "curl_global_init() failed\n"); + res_global_init(CURL_GLOBAL_ALL); + if(res) { fclose(hd_src); - return TEST_ERR_MAJOR_BAD; + return res; } - if ((curl = curl_easy_init()) == NULL) { - fprintf(stderr, "curl_easy_init() failed\n"); - fclose(hd_src); - curl_global_cleanup(); - return TEST_ERR_MAJOR_BAD; - } + easy_init(curl); /* enable uploading */ - test_setopt(curl, CURLOPT_UPLOAD, 1L); + easy_setopt(curl, CURLOPT_UPLOAD, 1L); /* specify target */ - test_setopt(curl,CURLOPT_URL, URL); + easy_setopt(curl,CURLOPT_URL, URL); /* go verbose */ - test_setopt(curl, CURLOPT_VERBOSE, 1L); + easy_setopt(curl, CURLOPT_VERBOSE, 1L); /* use active FTP */ - test_setopt(curl, CURLOPT_FTPPORT, "-"); + easy_setopt(curl, CURLOPT_FTPPORT, "-"); /* now specify which file to upload */ - test_setopt(curl, CURLOPT_READDATA, hd_src); + easy_setopt(curl, CURLOPT_READDATA, hd_src); /* NOTE: if you want this code to work on Windows with libcurl as a DLL, you MUST also provide a read callback with CURLOPT_READFUNCTION. Failing to @@ -111,114 +106,60 @@ int test(char *URL) option you MUST make sure that the type of the passed-in argument is a curl_off_t. If you use CURLOPT_INFILESIZE (without _LARGE) you must make sure that to pass in a type 'long' argument. */ - test_setopt(curl, CURLOPT_INFILESIZE_LARGE, - (curl_off_t)file_info.st_size); - - if ((m = curl_multi_init()) == NULL) { - fprintf(stderr, "curl_multi_init() failed\n"); - curl_easy_cleanup(curl); - curl_global_cleanup(); - fclose(hd_src); - return TEST_ERR_MAJOR_BAD; - } + easy_setopt(curl, CURLOPT_INFILESIZE_LARGE, (curl_off_t)file_info.st_size); - if ((res = (int)curl_multi_add_handle(m, curl)) != CURLM_OK) { - fprintf(stderr, "curl_multi_add_handle() failed, " - "with code %d\n", res); - curl_multi_cleanup(m); - curl_easy_cleanup(curl); - curl_global_cleanup(); - fclose(hd_src); - return TEST_ERR_MAJOR_BAD; - } + multi_init(m); - ml_timedout = FALSE; - ml_start = tutil_tvnow(); + multi_add_handle(m, curl); - while (!done) { - fd_set rd, wr, exc; - int max_fd; + for(;;) { struct timeval interval; + fd_set rd, wr, exc; + int maxfd = -99; interval.tv_sec = 1; interval.tv_usec = 0; - if (tutil_tvdiff(tutil_tvnow(), ml_start) > - MAIN_LOOP_HANG_TIMEOUT) { - ml_timedout = TRUE; - break; - } - mp_timedout = FALSE; - mp_start = tutil_tvnow(); - - while (res == CURLM_CALL_MULTI_PERFORM) { - res = (int)curl_multi_perform(m, &running); - if (tutil_tvdiff(tutil_tvnow(), mp_start) > - MULTI_PERFORM_HANG_TIMEOUT) { - mp_timedout = TRUE; - break; - } - if (running <= 0) { - done = TRUE; - break; - } - } - if (mp_timedout || done) - break; - - if (res != CURLM_OK) { - fprintf(stderr, "not okay???\n"); - break; - } + multi_perform(m, &running); + + abort_on_test_timeout(); + + if(!running) + break; /* done */ FD_ZERO(&rd); FD_ZERO(&wr); FD_ZERO(&exc); - max_fd = 0; - if (curl_multi_fdset(m, &rd, &wr, &exc, &max_fd) != CURLM_OK) { - fprintf(stderr, "unexpected failured of fdset.\n"); - res = 189; - break; - } + multi_fdset(m, &rd, &wr, &exc, &maxfd); - if (select_test(max_fd+1, &rd, &wr, &exc, &interval) == -1) { - fprintf(stderr, "bad select??\n"); - res = 195; - break; - } + /* At this point, maxfd is guaranteed to be greater or equal than -1. */ - res = CURLM_CALL_MULTI_PERFORM; - } + select_test(maxfd+1, &rd, &wr, &exc, &interval); - if (ml_timedout || mp_timedout) { - if (ml_timedout) fprintf(stderr, "ml_timedout\n"); - if (mp_timedout) fprintf(stderr, "mp_timedout\n"); - fprintf(stderr, "ABORTING TEST, since it seems " - "that it would have run forever.\n"); - res = TEST_ERR_RUNS_FOREVER; + abort_on_test_timeout(); } test_cleanup: #ifdef LIB529 /* test 529 */ - if(m) { - curl_multi_remove_handle(m, curl); - curl_multi_cleanup(m); - } + /* proper cleanup sequence - type PA */ + curl_multi_remove_handle(m, curl); + curl_multi_cleanup(m); curl_easy_cleanup(curl); + curl_global_cleanup(); #else /* test 525 */ - if(m) - curl_multi_remove_handle(m, curl); + /* proper cleanup sequence - type PB */ + curl_multi_remove_handle(m, curl); curl_easy_cleanup(curl); - if(m) - curl_multi_cleanup(m); + curl_multi_cleanup(m); + curl_global_cleanup(); #endif - fclose(hd_src); /* close the local file */ + /* close the local file */ + fclose(hd_src); - curl_global_cleanup(); return res; } |