diff options
author | Elliott Hughes <enh@google.com> | 2018-10-30 11:28:38 -0700 |
---|---|---|
committer | Elliott Hughes <enh@google.com> | 2018-10-30 11:28:38 -0700 |
commit | b1ef70f7d9fdfa1431b948df6ae7bb0b15966dee (patch) | |
tree | 24facefd22d2ca56694f740049660701da90ee9a /tests/libtest/lib1531.c | |
parent | 8c49d19ccbe7df4ce7b150f5d92eaddcc7f369df (diff) | |
download | external_curl-b1ef70f7d9fdfa1431b948df6ae7bb0b15966dee.tar.gz external_curl-b1ef70f7d9fdfa1431b948df6ae7bb0b15966dee.tar.bz2 external_curl-b1ef70f7d9fdfa1431b948df6ae7bb0b15966dee.zip |
Update to curl 7.61.1 - September 5 2018.
Bug: N/A
Test: builds, boots, `vendor/google/tools/fake-ota on streaming` works
Change-Id: Ic8598fc9d0bc029640ea3cbcecf4820d1de8f6ae
Diffstat (limited to 'tests/libtest/lib1531.c')
-rw-r--r-- | tests/libtest/lib1531.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/tests/libtest/lib1531.c b/tests/libtest/lib1531.c index 5ee617e5..953f062d 100644 --- a/tests/libtest/lib1531.c +++ b/tests/libtest/lib1531.c @@ -39,6 +39,8 @@ int test(char *URL) int msgs_left; /* how many messages are left */ int res = CURLE_OK; + start_test_timing(); + global_init(CURL_GLOBAL_ALL); /* Allocate one CURL handle per transfer */ @@ -59,6 +61,8 @@ int test(char *URL) /* we start some action by calling perform right away */ curl_multi_perform(multi_handle, &still_running); + abort_on_test_timeout(); + do { struct timeval timeout; int rc; /* select() return code */ @@ -127,6 +131,8 @@ int test(char *URL) curl_multi_perform(multi_handle, &still_running); break; } + + abort_on_test_timeout(); } while(still_running); /* See how the transfers went */ @@ -136,14 +142,17 @@ int test(char *URL) printf("HTTP transfer completed with status %d\n", msg->data.result); break; } + + abort_on_test_timeout(); } while(msg); +test_cleanup: curl_multi_cleanup(multi_handle); /* Free the CURL handles */ curl_easy_cleanup(easy); curl_global_cleanup(); - return 0; + return res; } |