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

tests: Use standard libtest return codes when relevant

Browse Source
This commit is contained in:
Dan Fandrich 2014-05-05 15:30:05 +02:00
parent 40e6af893b
commit e673f55c45
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/libtest/lib1500.c
View File

@ -32,7 +32,7 @@ int test(char *URL)
CURL* curls = NULL; CURL* curls = NULL;
CURLM* multi = NULL; CURLM* multi = NULL;
int still_running; int still_running;
int i = -1; int i = TEST_ERR_FAILURE;
int res = 0; int res = 0;
CURLMsg *msg; CURLMsg *msg;
@ -58,7 +58,7 @@ int test(char *URL)
res = curl_multi_wait(multi, NULL, 0, TEST_HANG_TIMEOUT, &num); res = curl_multi_wait(multi, NULL, 0, TEST_HANG_TIMEOUT, &num);
if (res != CURLM_OK) { if (res != CURLM_OK) {
printf("curl_multi_wait() returned %d\n", res); printf("curl_multi_wait() returned %d\n", res);
res = -1; res = TEST_ERR_MAJOR_BAD;
goto test_cleanup; goto test_cleanup;
} }

8
tests/libtest/lib505.c
View File

@ -50,7 +50,7 @@ int test(char *URL)
if (!libtest_arg2) { if (!libtest_arg2) {
fprintf(stderr, "Usage: <url> <file-to-upload>\n"); fprintf(stderr, "Usage: <url> <file-to-upload>\n");
return -1; return TEST_ERR_USAGE;
} }
hd_src = fopen(libtest_arg2, "rb"); hd_src = fopen(libtest_arg2, "rb");
@ -59,7 +59,7 @@ int test(char *URL)
fprintf(stderr, "fopen() failed with error: %d %s\n", fprintf(stderr, "fopen() failed with error: %d %s\n",
error, strerror(error)); error, strerror(error));
fprintf(stderr, "Error opening file: %s\n", libtest_arg2); fprintf(stderr, "Error opening file: %s\n", libtest_arg2);
return -2; /* if this happens things are major weird */ return TEST_ERR_MAJOR_BAD; /* if this happens things are major weird */
} }
/* get the file size of the local file */ /* get the file size of the local file */
@ -71,13 +71,13 @@ int test(char *URL)
error, strerror(error)); 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); fclose(hd_src);
return -1; return TEST_ERR_MAJOR_BAD;
} }
if(! file_info.st_size) { if(! file_info.st_size) {
fprintf(stderr, "ERROR: file %s has zero size!\n", libtest_arg2); fprintf(stderr, "ERROR: file %s has zero size!\n", libtest_arg2);
fclose(hd_src); fclose(hd_src);
return -4; return TEST_ERR_MAJOR_BAD;
} }
if (curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) { if (curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) {

8
tests/libtest/lib541.c
View File

@ -36,13 +36,13 @@ int test(char *URL)
CURL *curl; CURL *curl;
CURLcode res = CURLE_OK; CURLcode res = CURLE_OK;
FILE *hd_src ; FILE *hd_src ;
int hd ; int hd;
struct_stat file_info; struct_stat file_info;
int error; int error;
if (!libtest_arg2) { if (!libtest_arg2) {
fprintf(stderr, "Usage: <url> <file-to-upload>\n"); fprintf(stderr, "Usage: <url> <file-to-upload>\n");
return -1; return TEST_ERR_USAGE;
} }
hd_src = fopen(libtest_arg2, "rb"); hd_src = fopen(libtest_arg2, "rb");
@ -63,13 +63,13 @@ int test(char *URL)
error, strerror(error)); 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); fclose(hd_src);
return -1; return TEST_ERR_MAJOR_BAD;
} }
if(! file_info.st_size) { if(! file_info.st_size) {
fprintf(stderr, "ERROR: file %s has zero size!\n", libtest_arg2); fprintf(stderr, "ERROR: file %s has zero size!\n", libtest_arg2);
fclose(hd_src); fclose(hd_src);
return -4; return TEST_ERR_MAJOR_BAD;
} }
if (curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) { if (curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) {