diff options
Diffstat (limited to 'tests/libtest')
-rw-r--r-- | tests/libtest/CMakeLists.txt | 4 | ||||
-rw-r--r-- | tests/libtest/Makefile.am | 4 | ||||
-rw-r--r-- | tests/libtest/lib502.c | 2 | ||||
-rw-r--r-- | tests/libtest/lib507.c | 6 | ||||
-rw-r--r-- | tests/libtest/lib518.c | 8 | ||||
-rw-r--r-- | tests/libtest/lib526.c | 4 | ||||
-rw-r--r-- | tests/libtest/lib530.c | 4 | ||||
-rw-r--r-- | tests/libtest/lib533.c | 4 | ||||
-rw-r--r-- | tests/libtest/lib536.c | 2 | ||||
-rw-r--r-- | tests/libtest/lib537.c | 8 | ||||
-rw-r--r-- | tests/libtest/lib556.c | 2 | ||||
-rw-r--r-- | tests/libtest/lib558.c | 2 | ||||
-rwxr-xr-x | tests/libtest/test1013.pl | 2 | ||||
-rwxr-xr-x | tests/libtest/test1022.pl | 2 | ||||
-rwxr-xr-x | tests/libtest/test307.pl | 2 | ||||
-rwxr-xr-x | tests/libtest/test610.pl | 2 | ||||
-rwxr-xr-x | tests/libtest/test613.pl | 2 | ||||
-rwxr-xr-x | tests/libtest/test75.pl | 2 |
18 files changed, 31 insertions, 31 deletions
diff --git a/tests/libtest/CMakeLists.txt b/tests/libtest/CMakeLists.txt index f0ee8cd2b..653e5315d 100644 --- a/tests/libtest/CMakeLists.txt +++ b/tests/libtest/CMakeLists.txt @@ -20,9 +20,9 @@ function(SETUP_TEST TEST_NAME) # ARGN are the files in the test set_target_properties(${TEST_NAME} PROPERTIES PROJECT_LABEL "${TARGET_LABEL_PREFIX}${TEST_NAME}") - # Add the postfix to the executable since it is + # Add the postfix to the executable since it is # not added automatically as for modules and shared libraries - set_target_properties(${TEST_NAME} + set_target_properties(${TEST_NAME} PROPERTIES DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}") if(MSVC) diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am index 81a0606be..9c041d7f2 100644 --- a/tests/libtest/Makefile.am +++ b/tests/libtest/Makefile.am @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2009, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -48,7 +48,7 @@ INCLUDES = -I$(top_builddir)/include/curl \ -I$(top_builddir)/include \ -I$(top_srcdir)/include \ -I$(top_builddir)/lib \ - -I$(top_srcdir)/lib + -I$(top_srcdir)/lib endif EXTRA_DIST = test75.pl test307.pl test610.pl test613.pl test1013.pl \ diff --git a/tests/libtest/lib502.c b/tests/libtest/lib502.c index 0a0a819b0..d1c734cc7 100644 --- a/tests/libtest/lib502.c +++ b/tests/libtest/lib502.c @@ -63,7 +63,7 @@ int test(char *URL) while (running) { res = (int)curl_multi_perform(m, &running); - if (tutil_tvdiff(tutil_tvnow(), mp_start) > + if (tutil_tvdiff(tutil_tvnow(), mp_start) > MULTI_PERFORM_HANG_TIMEOUT) { mp_timedout = TRUE; break; diff --git a/tests/libtest/lib507.c b/tests/libtest/lib507.c index 252775840..306ba2da3 100644 --- a/tests/libtest/lib507.c +++ b/tests/libtest/lib507.c @@ -64,7 +64,7 @@ int test(char *URL) do { ret = curl_multi_perform(multi, &still_running); - if (tutil_tvdiff(tutil_tvnow(), mp_start) > + if (tutil_tvdiff(tutil_tvnow(), mp_start) > MULTI_PERFORM_HANG_TIMEOUT) { mp_timedout = TRUE; break; @@ -88,7 +88,7 @@ int test(char *URL) timeout.tv_sec = 1; timeout.tv_usec = 0; - if (tutil_tvdiff(tutil_tvnow(), ml_start) > + if (tutil_tvdiff(tutil_tvnow(), ml_start) > MAIN_LOOP_HANG_TIMEOUT) { ml_timedout = TRUE; break; @@ -105,7 +105,7 @@ int test(char *URL) mp_start = tutil_tvnow(); do { ret = curl_multi_perform(multi, &still_running); - if (tutil_tvdiff(tutil_tvnow(), mp_start) > + if (tutil_tvdiff(tutil_tvnow(), mp_start) > MULTI_PERFORM_HANG_TIMEOUT) { mp_timedout = TRUE; break; diff --git a/tests/libtest/lib518.c b/tests/libtest/lib518.c index d8310d92d..9d1ae96ac 100644 --- a/tests/libtest/lib518.c +++ b/tests/libtest/lib518.c @@ -216,7 +216,7 @@ static int rlimit(int keep_open) /* * verify that soft limit is higher than NUM_NEEDED, - * which is the number of file descriptors we would + * which is the number of file descriptors we would * try to open plus SAFETY_MARGIN to not exhaust the * file descriptor pool */ @@ -329,8 +329,8 @@ static int rlimit(int keep_open) /* create a bunch of file descriptors */ - for (num_open.rlim_cur = 1; - num_open.rlim_cur < num_open.rlim_max; + for (num_open.rlim_cur = 1; + num_open.rlim_cur < num_open.rlim_max; num_open.rlim_cur++) { fd[num_open.rlim_cur] = dup(fd[0]); @@ -468,7 +468,7 @@ int test(char *URL) return TEST_ERR_MAJOR_BAD; } - /* run the test with the bunch of open file descriptors + /* run the test with the bunch of open file descriptors and close them all once the test is over */ if (curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) { diff --git a/tests/libtest/lib526.c b/tests/libtest/lib526.c index 89fddbc51..65fa2fd3a 100644 --- a/tests/libtest/lib526.c +++ b/tests/libtest/lib526.c @@ -129,7 +129,7 @@ int test(char *URL) interval.tv_sec = 1; interval.tv_usec = 0; - if (tutil_tvdiff(tutil_tvnow(), ml_start) > + if (tutil_tvdiff(tutil_tvnow(), ml_start) > MAIN_LOOP_HANG_TIMEOUT) { ml_timedout = TRUE; break; @@ -139,7 +139,7 @@ int test(char *URL) while (res == CURLM_CALL_MULTI_PERFORM) { res = (int)curl_multi_perform(m, &running); - if (tutil_tvdiff(tutil_tvnow(), mp_start) > + if (tutil_tvdiff(tutil_tvnow(), mp_start) > MULTI_PERFORM_HANG_TIMEOUT) { mp_timedout = TRUE; break; diff --git a/tests/libtest/lib530.c b/tests/libtest/lib530.c index 3b0bd001c..01f35f765 100644 --- a/tests/libtest/lib530.c +++ b/tests/libtest/lib530.c @@ -141,7 +141,7 @@ int test(char *URL) interval.tv_sec = 1; interval.tv_usec = 0; - if (tutil_tvdiff(tutil_tvnow(), ml_start) > + if (tutil_tvdiff(tutil_tvnow(), ml_start) > MAIN_LOOP_HANG_TIMEOUT) { ml_timedout = TRUE; break; @@ -151,7 +151,7 @@ int test(char *URL) while (res == CURLM_CALL_MULTI_PERFORM) { res = (int)curl_multi_perform(m, &running); - if (tutil_tvdiff(tutil_tvnow(), mp_start) > + if (tutil_tvdiff(tutil_tvnow(), mp_start) > MULTI_PERFORM_HANG_TIMEOUT) { mp_timedout = TRUE; break; diff --git a/tests/libtest/lib533.c b/tests/libtest/lib533.c index 810b075e5..42dfb1a41 100644 --- a/tests/libtest/lib533.c +++ b/tests/libtest/lib533.c @@ -79,7 +79,7 @@ int test(char *URL) interval.tv_sec = 1; interval.tv_usec = 0; - if (tutil_tvdiff(tutil_tvnow(), ml_start) > + if (tutil_tvdiff(tutil_tvnow(), ml_start) > MAIN_LOOP_HANG_TIMEOUT) { ml_timedout = TRUE; break; @@ -89,7 +89,7 @@ int test(char *URL) while (res == CURLM_CALL_MULTI_PERFORM) { res = (int)curl_multi_perform(m, &running); - if (tutil_tvdiff(tutil_tvnow(), mp_start) > + if (tutil_tvdiff(tutil_tvnow(), mp_start) > MULTI_PERFORM_HANG_TIMEOUT) { mp_timedout = TRUE; break; diff --git a/tests/libtest/lib536.c b/tests/libtest/lib536.c index 06d863ca9..2300ce109 100644 --- a/tests/libtest/lib536.c +++ b/tests/libtest/lib536.c @@ -33,7 +33,7 @@ static CURLMcode perform(CURLM * multi) for (;;) { code = curl_multi_perform(multi, &handles); - if (tutil_tvdiff(tutil_tvnow(), mp_start) > + if (tutil_tvdiff(tutil_tvnow(), mp_start) > MULTI_PERFORM_HANG_TIMEOUT) { mp_timedout = TRUE; break; diff --git a/tests/libtest/lib537.c b/tests/libtest/lib537.c index 791448a86..b15cb8ac1 100644 --- a/tests/libtest/lib537.c +++ b/tests/libtest/lib537.c @@ -204,7 +204,7 @@ static int rlimit(int keep_open) /* * test 537 is all about testing libcurl functionality * when the system has nearly exhausted the number of - * available file descriptors. Test 537 will try to run + * available file descriptors. Test 537 will try to run * with a very small number of file descriptors available. * This implies that any file descriptor which is open * when the test runs will have a number in the high range @@ -323,8 +323,8 @@ static int rlimit(int keep_open) /* create a bunch of file descriptors */ - for (num_open.rlim_cur = 1; - num_open.rlim_cur < num_open.rlim_max; + for (num_open.rlim_cur = 1; + num_open.rlim_cur < num_open.rlim_max; num_open.rlim_cur++) { fd[num_open.rlim_cur] = dup(fd[0]); @@ -471,7 +471,7 @@ int test(char *URL) return TEST_ERR_MAJOR_BAD; } - /* run the test with the bunch of open file descriptors + /* run the test with the bunch of open file descriptors and close them all once the test is over */ if (curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK) { diff --git a/tests/libtest/lib556.c b/tests/libtest/lib556.c index 26ae30ccd..583723d22 100644 --- a/tests/libtest/lib556.c +++ b/tests/libtest/lib556.c @@ -46,7 +46,7 @@ int test(char *URL) if(!res) { /* we are connected, now get a HTTP document the raw way */ - const char *request = + const char *request = #ifdef CURL_DOES_CONVERSIONS /* ASCII representation with escape sequences for non-ASCII platforms */ "\x47\x45\x54\x20\x2f\x35\x35\x36\x20\x48\x54\x54\x50\x2f\x31\x2e" diff --git a/tests/libtest/lib558.c b/tests/libtest/lib558.c index 253e043e1..7ed991dd3 100644 --- a/tests/libtest/lib558.c +++ b/tests/libtest/lib558.c @@ -88,7 +88,7 @@ int test(char *URL) CURL *easyh = NULL; struct curl_hash *hp = NULL; int result = 0; - + if(!strcmp(URL, "check")) { /* test harness script verifying if this test can run */ return 0; /* sure, run this! */ diff --git a/tests/libtest/test1013.pl b/tests/libtest/test1013.pl index 8ab1a8c95..33127da4a 100755 --- a/tests/libtest/test1013.pl +++ b/tests/libtest/test1013.pl @@ -1,7 +1,7 @@ #!/usr/bin/env perl # Determine if curl-config --protocols/--features matches the # curl --version protocols/features -if ( $#ARGV != 2 ) +if ( $#ARGV != 2 ) { print "Usage: $0 curl-config-script curl-version-output-file features|protocols\n"; exit 3; diff --git a/tests/libtest/test1022.pl b/tests/libtest/test1022.pl index 5b16de3e0..94b3cb04f 100755 --- a/tests/libtest/test1022.pl +++ b/tests/libtest/test1022.pl @@ -1,6 +1,6 @@ #!/usr/bin/env perl # Determine if curl-config --version matches the curl --version -if ( $#ARGV != 2 ) +if ( $#ARGV != 2 ) { print "Usage: $0 curl-config-script curl-version-output-file version|vernum\n"; exit 3; diff --git a/tests/libtest/test307.pl b/tests/libtest/test307.pl index 7e2687b54..b8e3214fc 100755 --- a/tests/libtest/test307.pl +++ b/tests/libtest/test307.pl @@ -1,6 +1,6 @@ #!/usr/bin/env perl # Determine if the given curl executable supports the 'openssl' SSL engine -if ( $#ARGV != 0 ) +if ( $#ARGV != 0 ) { print "Usage: $0 curl-executable\n"; exit 3; diff --git a/tests/libtest/test610.pl b/tests/libtest/test610.pl index 5257171a7..c9542ca51 100755 --- a/tests/libtest/test610.pl +++ b/tests/libtest/test610.pl @@ -1,6 +1,6 @@ #!/usr/bin/env perl # Perform simple file and directory manipulation in a portable way -if ( $#ARGV <= 0 ) +if ( $#ARGV <= 0 ) { print "Usage: $0 mkdir|rmdir|rm|move|gone path1 [path2] [more commands...]\n"; exit 1; diff --git a/tests/libtest/test613.pl b/tests/libtest/test613.pl index ba9ed32e9..dc3b1fb2e 100755 --- a/tests/libtest/test613.pl +++ b/tests/libtest/test613.pl @@ -2,7 +2,7 @@ # Prepare a directory with known files and clean up afterwards use Time::Local; -if ( $#ARGV < 1 ) +if ( $#ARGV < 1 ) { print "Usage: $0 prepare|postprocess dir [logfile]\n"; exit 1; diff --git a/tests/libtest/test75.pl b/tests/libtest/test75.pl index 01a53ff15..4d14b1e12 100755 --- a/tests/libtest/test75.pl +++ b/tests/libtest/test75.pl @@ -1,6 +1,6 @@ #!/usr/bin/env perl # Check that the length of a given URL is correct -if ( $#ARGV != 1 ) +if ( $#ARGV != 1 ) { print "Usage: $0 string length\n"; exit 3; |