diff options
author | Dan Fandrich <dan@coneharvesters.com> | 2014-05-05 15:30:05 +0200 |
---|---|---|
committer | Dan Fandrich <dan@coneharvesters.com> | 2014-05-05 15:30:05 +0200 |
commit | e673f55c451772233344dde5a0923c21fc80caed (patch) | |
tree | 3d39872fc236704f7c74960adff228f362bd1663 /tests/libtest | |
parent | 40e6af893b9a342e41ac5d0e1b63bfc21c5929bf (diff) | |
download | curl-e673f55c451772233344dde5a0923c21fc80caed.tar.gz |
tests: Use standard libtest return codes when relevant
Diffstat (limited to 'tests/libtest')
-rw-r--r-- | tests/libtest/lib1500.c | 4 | ||||
-rw-r--r-- | tests/libtest/lib505.c | 8 | ||||
-rw-r--r-- | tests/libtest/lib541.c | 8 |
3 files changed, 10 insertions, 10 deletions
diff --git a/tests/libtest/lib1500.c b/tests/libtest/lib1500.c index 76e3d320c..08b917fcc 100644 --- a/tests/libtest/lib1500.c +++ b/tests/libtest/lib1500.c @@ -32,7 +32,7 @@ int test(char *URL) CURL* curls = NULL; CURLM* multi = NULL; int still_running; - int i = -1; + int i = TEST_ERR_FAILURE; int res = 0; CURLMsg *msg; @@ -58,7 +58,7 @@ int test(char *URL) res = curl_multi_wait(multi, NULL, 0, TEST_HANG_TIMEOUT, &num); if (res != CURLM_OK) { printf("curl_multi_wait() returned %d\n", res); - res = -1; + res = TEST_ERR_MAJOR_BAD; goto test_cleanup; } diff --git a/tests/libtest/lib505.c b/tests/libtest/lib505.c index 99b3a0afe..e9e20a879 100644 --- a/tests/libtest/lib505.c +++ b/tests/libtest/lib505.c @@ -50,7 +50,7 @@ int test(char *URL) if (!libtest_arg2) { fprintf(stderr, "Usage: <url> <file-to-upload>\n"); - return -1; + return TEST_ERR_USAGE; } hd_src = fopen(libtest_arg2, "rb"); @@ -59,7 +59,7 @@ int test(char *URL) fprintf(stderr, "fopen() failed with error: %d %s\n", error, strerror(error)); 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 */ @@ -71,13 +71,13 @@ int test(char *URL) error, strerror(error)); fprintf(stderr, "ERROR: cannot open file %s\n", libtest_arg2); fclose(hd_src); - return -1; + return TEST_ERR_MAJOR_BAD; } if(! file_info.st_size) { fprintf(stderr, "ERROR: file %s has zero size!\n", libtest_arg2); fclose(hd_src); - return -4; + return TEST_ERR_MAJOR_BAD; } if (curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) { diff --git a/tests/libtest/lib541.c b/tests/libtest/lib541.c index 5fe8dd8ad..3318b9b8b 100644 --- a/tests/libtest/lib541.c +++ b/tests/libtest/lib541.c @@ -36,13 +36,13 @@ int test(char *URL) CURL *curl; CURLcode res = CURLE_OK; FILE *hd_src ; - int hd ; + int hd; struct_stat file_info; int error; if (!libtest_arg2) { fprintf(stderr, "Usage: <url> <file-to-upload>\n"); - return -1; + return TEST_ERR_USAGE; } hd_src = fopen(libtest_arg2, "rb"); @@ -63,13 +63,13 @@ int test(char *URL) error, strerror(error)); fprintf(stderr, "ERROR: cannot open file %s\n", libtest_arg2); fclose(hd_src); - return -1; + return TEST_ERR_MAJOR_BAD; } if(! file_info.st_size) { fprintf(stderr, "ERROR: file %s has zero size!\n", libtest_arg2); fclose(hd_src); - return -4; + return TEST_ERR_MAJOR_BAD; } if (curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) { |