diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-10-30 23:00:37 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-10-30 23:00:37 +0000 |
| commit | 849332cb73701636b19b97f3d82e8e9fa0d51a30 (patch) | |
| tree | 24facefd22d2ca56694f740049660701da90ee9a /tests/libtest/lib1531.c | |
| parent | 8c49d19ccbe7df4ce7b150f5d92eaddcc7f369df (diff) | |
| parent | b1ef70f7d9fdfa1431b948df6ae7bb0b15966dee (diff) | |
| download | external_curl-849332cb73701636b19b97f3d82e8e9fa0d51a30.tar.gz external_curl-849332cb73701636b19b97f3d82e8e9fa0d51a30.tar.bz2 external_curl-849332cb73701636b19b97f3d82e8e9fa0d51a30.zip | |
Merge "Update to curl 7.61.1 - September 5 2018."android-wear-8.0.0_r2android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-n-iot-release-ihome-igv1
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; } |