generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

multi tests: OOM handling fixes - commit 629d2e34 follow-up

Browse Source
This commit is contained in:
Yang Tse
2011-10-26 18:46:32 +02:00
parent 8165e05f29
commit 51e5a2bf3f
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/libtest/lib540.c
View File

@@ -136,6 +136,8 @@ static int loop(int num, CURLM *cm, const char* url, const char* userpwd,
if(res) if(res)
return res; return res;
/* At this point, L is guaranteed to be greater or equal than -1. */
if(L != -1) { if(L != -1) {
T.tv_sec = L/1000; T.tv_sec = L/1000;
T.tv_usec = (L%1000)*1000; T.tv_usec = (L%1000)*1000;

23
tests/libtest/test.h
View File

@@ -95,6 +95,7 @@ extern int unitfail;
#define TEST_ERR_USAGE 118 #define TEST_ERR_USAGE 118
#define TEST_ERR_FOPEN 117 #define TEST_ERR_FOPEN 117
#define TEST_ERR_FSTAT 116 #define TEST_ERR_FSTAT 116
#define TEST_ERR_BAD_TIMEOUT 115
/* /*
** Macros for test source code readability/maintainability. ** Macros for test source code readability/maintainability.
@@ -301,14 +302,20 @@ extern int unitfail;
/* ---------------------------------------------------------------- */ /* ---------------------------------------------------------------- */
#define exe_multi_timeout(A,B,Y,Z) do { \ #define exe_multi_timeout(A,B,Y,Z) do { \
CURLMcode ec; \ CURLMcode ec; \
if((ec = curl_multi_timeout((A),(B))) != CURLM_OK) { \ if((ec = curl_multi_timeout((A),(B))) != CURLM_OK) { \
fprintf(stderr, "%s:%d curl_multi_timeout() failed, " \ fprintf(stderr, "%s:%d curl_multi_timeout() failed, " \
"with code %d (%s)\n", \ "with code %d (%s)\n", \
(Y), (Z), (int)ec, curl_multi_strerror(ec)); \ (Y), (Z), (int)ec, curl_multi_strerror(ec)); \
res = (int)ec; \ res = (int)ec; \
} \ } \
else if(*((B)) < -1L) { \
fprintf(stderr, "%s:%d curl_multi_timeout() succeeded, " \
"but returned invalid timeout value (%ld)\n", \
(Y), (Z), (long)*((B))); \
res = TEST_ERR_BAD_TIMEOUT; \
} \
} WHILE_FALSE } WHILE_FALSE
#define res_multi_timeout(A,B) \ #define res_multi_timeout(A,B) \