diff options
45 files changed, 78 insertions, 3 deletions
diff --git a/tests/libtest/first.c b/tests/libtest/first.c index d25c7ad28..9b06f74bc 100644 --- a/tests/libtest/first.c +++ b/tests/libtest/first.c @@ -11,9 +11,8 @@ #include "test.h" #ifdef CURLDEBUG -/* provide a proto for this debug function */ -extern void curl_memdebug(const char *); -extern void curl_memlimit(int); +# define MEMDEBUG_NODEFINES +# include "memdebug.h" #endif int select_test (int num_fds, fd_set *rd, fd_set *wr, fd_set *exc, diff --git a/tests/libtest/lib500.c b/tests/libtest/lib500.c index c28f5d0c9..14a8e7aeb 100644 --- a/tests/libtest/lib500.c +++ b/tests/libtest/lib500.c @@ -10,6 +10,8 @@ #include "test.h" +#include "memdebug.h" + int test(char *URL) { CURLcode res; diff --git a/tests/libtest/lib501.c b/tests/libtest/lib501.c index cf2d95724..ff2bbb5b9 100644 --- a/tests/libtest/lib501.c +++ b/tests/libtest/lib501.c @@ -10,6 +10,8 @@ #include "test.h" +#include "memdebug.h" + int test(char *URL) { CURLcode res; diff --git a/tests/libtest/lib502.c b/tests/libtest/lib502.c index ea53795c0..85c300fbe 100644 --- a/tests/libtest/lib502.c +++ b/tests/libtest/lib502.c @@ -11,6 +11,7 @@ #include "test.h" #include "testutil.h" +#include "memdebug.h" #define MAIN_LOOP_HANG_TIMEOUT 90 * 1000 #define MULTI_PERFORM_HANG_TIMEOUT 60 * 1000 diff --git a/tests/libtest/lib503.c b/tests/libtest/lib503.c index 5eda5996e..11f1150c0 100644 --- a/tests/libtest/lib503.c +++ b/tests/libtest/lib503.c @@ -13,6 +13,7 @@ #include <sys/types.h> #include "testutil.h" +#include "memdebug.h" #define MAIN_LOOP_HANG_TIMEOUT 90 * 1000 #define MULTI_PERFORM_HANG_TIMEOUT 60 * 1000 diff --git a/tests/libtest/lib504.c b/tests/libtest/lib504.c index a57a3d157..fece016b8 100644 --- a/tests/libtest/lib504.c +++ b/tests/libtest/lib504.c @@ -13,6 +13,7 @@ #include <sys/types.h> #include "testutil.h" +#include "memdebug.h" #define MAIN_LOOP_HANG_TIMEOUT 90 * 1000 #define MULTI_PERFORM_HANG_TIMEOUT 60 * 1000 diff --git a/tests/libtest/lib505.c b/tests/libtest/lib505.c index eec2071c9..ceccd6b28 100644 --- a/tests/libtest/lib505.c +++ b/tests/libtest/lib505.c @@ -28,6 +28,8 @@ #include <unistd.h> #endif +#include "memdebug.h" + /* * This example shows an FTP upload, with a rename of the file just after * a successful upload. diff --git a/tests/libtest/lib506.c b/tests/libtest/lib506.c index 260fec194..34c774e5d 100644 --- a/tests/libtest/lib506.c +++ b/tests/libtest/lib506.c @@ -15,6 +15,8 @@ #include <curl/mprintf.h> +#include "memdebug.h" + static const char *HOSTHEADER = "Host: www.host.foo.com"; static const char *JAR = "log/jar506"; #define THREADS 2 diff --git a/tests/libtest/lib507.c b/tests/libtest/lib507.c index 0137130ce..b2fd09888 100644 --- a/tests/libtest/lib507.c +++ b/tests/libtest/lib507.c @@ -11,6 +11,7 @@ #include "test.h" #include "testutil.h" +#include "memdebug.h" #define MAIN_LOOP_HANG_TIMEOUT 90 * 1000 #define MULTI_PERFORM_HANG_TIMEOUT 60 * 1000 diff --git a/tests/libtest/lib508.c b/tests/libtest/lib508.c index 35679d180..a709b80be 100644 --- a/tests/libtest/lib508.c +++ b/tests/libtest/lib508.c @@ -10,6 +10,8 @@ #include "test.h" +#include "memdebug.h" + static char data[]="this is what we post to the silly web server\n"; struct WriteThis { diff --git a/tests/libtest/lib510.c b/tests/libtest/lib510.c index d8644c3fa..43ead0936 100644 --- a/tests/libtest/lib510.c +++ b/tests/libtest/lib510.c @@ -10,6 +10,8 @@ #include "test.h" +#include "memdebug.h" + static const char *post[]={ "one", "two", diff --git a/tests/libtest/lib511.c b/tests/libtest/lib511.c index b0f455d59..0f9993db1 100644 --- a/tests/libtest/lib511.c +++ b/tests/libtest/lib511.c @@ -10,6 +10,8 @@ #include "test.h" +#include "memdebug.h" + int test(char *URL) { CURLcode res; diff --git a/tests/libtest/lib512.c b/tests/libtest/lib512.c index 0af95919b..14072f45c 100644 --- a/tests/libtest/lib512.c +++ b/tests/libtest/lib512.c @@ -10,6 +10,8 @@ #include "test.h" +#include "memdebug.h" + /* Test case code based on source in a bug report filed by James Bursa on 28 Apr 2004 */ diff --git a/tests/libtest/lib513.c b/tests/libtest/lib513.c index d6f3756b7..e49724ca6 100644 --- a/tests/libtest/lib513.c +++ b/tests/libtest/lib513.c @@ -10,6 +10,8 @@ #include "test.h" +#include "memdebug.h" + static size_t read_callback(void *ptr, size_t size, size_t nmemb, void *userp) { (void)ptr; diff --git a/tests/libtest/lib514.c b/tests/libtest/lib514.c index 419b8422a..06f975f34 100644 --- a/tests/libtest/lib514.c +++ b/tests/libtest/lib514.c @@ -10,6 +10,8 @@ #include "test.h" +#include "memdebug.h" + int test(char *URL) { CURL *curl; diff --git a/tests/libtest/lib515.c b/tests/libtest/lib515.c index 18df7c938..c85f2bed1 100644 --- a/tests/libtest/lib515.c +++ b/tests/libtest/lib515.c @@ -10,6 +10,8 @@ #include "test.h" +#include "memdebug.h" + int test(char *URL) { CURL *curl; diff --git a/tests/libtest/lib516.c b/tests/libtest/lib516.c index 8295699e3..b3c63f4b5 100644 --- a/tests/libtest/lib516.c +++ b/tests/libtest/lib516.c @@ -10,6 +10,8 @@ #include "test.h" +#include "memdebug.h" + int test(char *URL) { CURL *curl; diff --git a/tests/libtest/lib517.c b/tests/libtest/lib517.c index 20fba6fbd..86539fb73 100644 --- a/tests/libtest/lib517.c +++ b/tests/libtest/lib517.c @@ -10,6 +10,8 @@ #include "test.h" +#include "memdebug.h" + static const char *dates[]={ "Sun, 06 Nov 1994 08:49:37 GMT", "Sunday, 06-Nov-94 08:49:37 GMT", diff --git a/tests/libtest/lib518.c b/tests/libtest/lib518.c index 41c3fe282..a1b914916 100644 --- a/tests/libtest/lib518.c +++ b/tests/libtest/lib518.c @@ -26,6 +26,8 @@ #include <string.h> #endif +#include "memdebug.h" + #ifndef FD_SETSIZE #error "this test requires FD_SETSIZE" #endif diff --git a/tests/libtest/lib519.c b/tests/libtest/lib519.c index ce440485a..70ada8a15 100644 --- a/tests/libtest/lib519.c +++ b/tests/libtest/lib519.c @@ -10,6 +10,8 @@ #include "test.h" +#include "memdebug.h" + int test(char *URL) { CURLcode res; diff --git a/tests/libtest/lib520.c b/tests/libtest/lib520.c index 46cad415d..1d63881c3 100644 --- a/tests/libtest/lib520.c +++ b/tests/libtest/lib520.c @@ -10,6 +10,8 @@ #include "test.h" +#include "memdebug.h" + int test(char *URL) { CURLcode res; diff --git a/tests/libtest/lib521.c b/tests/libtest/lib521.c index 346ece056..60fe4d95d 100644 --- a/tests/libtest/lib521.c +++ b/tests/libtest/lib521.c @@ -10,6 +10,8 @@ #include "test.h" +#include "memdebug.h" + int test(char *URL) { CURLcode res; diff --git a/tests/libtest/lib523.c b/tests/libtest/lib523.c index 9f485ffed..c6011fc57 100644 --- a/tests/libtest/lib523.c +++ b/tests/libtest/lib523.c @@ -10,6 +10,8 @@ #include "test.h" +#include "memdebug.h" + int test(char *URL) { CURLcode res; diff --git a/tests/libtest/lib524.c b/tests/libtest/lib524.c index 2fde663ca..c8b07834a 100644 --- a/tests/libtest/lib524.c +++ b/tests/libtest/lib524.c @@ -10,6 +10,8 @@ #include "test.h" +#include "memdebug.h" + int test(char *URL) { CURLcode res; diff --git a/tests/libtest/lib525.c b/tests/libtest/lib525.c index 154c209e3..c503d1618 100644 --- a/tests/libtest/lib525.c +++ b/tests/libtest/lib525.c @@ -15,6 +15,7 @@ #include <fcntl.h> #include "testutil.h" +#include "memdebug.h" #define MAIN_LOOP_HANG_TIMEOUT 90 * 1000 #define MULTI_PERFORM_HANG_TIMEOUT 60 * 1000 diff --git a/tests/libtest/lib526.c b/tests/libtest/lib526.c index 8951a7444..b4d891337 100644 --- a/tests/libtest/lib526.c +++ b/tests/libtest/lib526.c @@ -34,6 +34,7 @@ #include <fcntl.h> #include "testutil.h" +#include "memdebug.h" #define MAIN_LOOP_HANG_TIMEOUT 90 * 1000 #define MULTI_PERFORM_HANG_TIMEOUT 60 * 1000 diff --git a/tests/libtest/lib530.c b/tests/libtest/lib530.c index af7d00d02..d738277f2 100644 --- a/tests/libtest/lib530.c +++ b/tests/libtest/lib530.c @@ -21,6 +21,7 @@ #endif #include "testutil.h" +#include "memdebug.h" #define MAIN_LOOP_HANG_TIMEOUT 90 * 1000 #define MULTI_PERFORM_HANG_TIMEOUT 60 * 1000 diff --git a/tests/libtest/lib533.c b/tests/libtest/lib533.c index 71c43c2ca..92b371a81 100644 --- a/tests/libtest/lib533.c +++ b/tests/libtest/lib533.c @@ -17,6 +17,7 @@ #include <fcntl.h> #include "testutil.h" +#include "memdebug.h" #define MAIN_LOOP_HANG_TIMEOUT 90 * 1000 #define MULTI_PERFORM_HANG_TIMEOUT 60 * 1000 diff --git a/tests/libtest/lib536.c b/tests/libtest/lib536.c index 9e764a97a..016b7e922 100644 --- a/tests/libtest/lib536.c +++ b/tests/libtest/lib536.c @@ -15,6 +15,7 @@ #include <fcntl.h> #include "testutil.h" +#include "memdebug.h" #define MAIN_LOOP_HANG_TIMEOUT 90 * 1000 #define MULTI_PERFORM_HANG_TIMEOUT 60 * 1000 diff --git a/tests/libtest/lib537.c b/tests/libtest/lib537.c index f3b42e755..7bb8c1436 100644 --- a/tests/libtest/lib537.c +++ b/tests/libtest/lib537.c @@ -26,6 +26,8 @@ #include <string.h> #endif +#include "memdebug.h" + #if !defined(HAVE_POLL_FINE) && \ !defined(USE_WINSOCK) && \ !defined(TPF) && \ diff --git a/tests/libtest/lib539.c b/tests/libtest/lib539.c index 0e43654ef..c99344421 100644 --- a/tests/libtest/lib539.c +++ b/tests/libtest/lib539.c @@ -10,6 +10,8 @@ #include "test.h" +#include "memdebug.h" + int test(char *URL) { CURLcode res; diff --git a/tests/libtest/lib540.c b/tests/libtest/lib540.c index 089fcd5cb..cfaa1622d 100644 --- a/tests/libtest/lib540.c +++ b/tests/libtest/lib540.c @@ -18,6 +18,8 @@ #include "test.h" +#include "memdebug.h" + #define PROXY libtest_arg2 #define PROXYUSERPWD libtest_arg3 #define HOST test_argv[4] diff --git a/tests/libtest/lib541.c b/tests/libtest/lib541.c index a2224ae69..ada389cf1 100644 --- a/tests/libtest/lib541.c +++ b/tests/libtest/lib541.c @@ -28,6 +28,8 @@ #include <unistd.h> #endif +#include "memdebug.h" + /* * Two FTP uploads, the second with no content sent. */ diff --git a/tests/libtest/lib542.c b/tests/libtest/lib542.c index ffd8f361c..1d45405bb 100644 --- a/tests/libtest/lib542.c +++ b/tests/libtest/lib542.c @@ -28,6 +28,8 @@ #include <unistd.h> #endif +#include "memdebug.h" + /* * FTP get with NOBODY but no HEADER */ diff --git a/tests/libtest/lib543.c b/tests/libtest/lib543.c index 2e930d2d6..662883529 100644 --- a/tests/libtest/lib543.c +++ b/tests/libtest/lib543.c @@ -13,6 +13,8 @@ #include "setup.h" #include "test.h" +#include "memdebug.h" + int test(char *URL) { unsigned char a[] = {0x9c, 0x26, 0x4b, 0x3d, 0x49, 0x4, 0xa1, 0x1, diff --git a/tests/libtest/lib544.c b/tests/libtest/lib544.c index f91cef354..756291972 100644 --- a/tests/libtest/lib544.c +++ b/tests/libtest/lib544.c @@ -10,6 +10,7 @@ #include "test.h" +#include "memdebug.h" static char teststring[] = "This\0 is test binary data with an embedded NUL byte\n"; diff --git a/tests/libtest/lib547.c b/tests/libtest/lib547.c index 85f22fe8e..8a1070f70 100644 --- a/tests/libtest/lib547.c +++ b/tests/libtest/lib547.c @@ -14,6 +14,8 @@ #include "test.h" +#include "memdebug.h" + #define UPLOADTHIS "this is the blurb we want to upload\n" #ifndef LIB548 diff --git a/tests/libtest/lib549.c b/tests/libtest/lib549.c index d50835624..e196aba56 100644 --- a/tests/libtest/lib549.c +++ b/tests/libtest/lib549.c @@ -14,6 +14,8 @@ #include "test.h" +#include "memdebug.h" + int test(char *URL) { CURLcode res; diff --git a/tests/libtest/lib552.c b/tests/libtest/lib552.c index ab097da3e..ff2b8c986 100644 --- a/tests/libtest/lib552.c +++ b/tests/libtest/lib552.c @@ -13,6 +13,8 @@ #include "test.h" +#include "memdebug.h" + struct data { char trace_ascii; /* 1 or 0 */ }; diff --git a/tests/libtest/lib553.c b/tests/libtest/lib553.c index 0603b3fd5..b9372b347 100644 --- a/tests/libtest/lib553.c +++ b/tests/libtest/lib553.c @@ -13,6 +13,8 @@ #include "test.h" +#include "memdebug.h" + #define POSTLEN 40960 static size_t myreadfunc(void *ptr, size_t size, size_t nmemb, void *stream) diff --git a/tests/libtest/lib554.c b/tests/libtest/lib554.c index fe0c16a66..2999aea08 100644 --- a/tests/libtest/lib554.c +++ b/tests/libtest/lib554.c @@ -10,6 +10,8 @@ #include "test.h" +#include "memdebug.h" + static char data[]="this is what we post to the silly web server\n"; struct WriteThis { diff --git a/tests/libtest/lib555.c b/tests/libtest/lib555.c index ad259e0e6..33a1a26c7 100644 --- a/tests/libtest/lib555.c +++ b/tests/libtest/lib555.c @@ -17,6 +17,7 @@ #include "test.h" #include "testutil.h" +#include "memdebug.h" #define MULTI_PERFORM_HANG_TIMEOUT 60 * 1000 diff --git a/tests/libtest/lib556.c b/tests/libtest/lib556.c index 85fd65699..0e3949da3 100644 --- a/tests/libtest/lib556.c +++ b/tests/libtest/lib556.c @@ -10,6 +10,8 @@ #include "test.h" +#include "memdebug.h" + int test(char *URL) { CURLcode res; diff --git a/tests/libtest/lib557.c b/tests/libtest/lib557.c index 13148dd84..cb54ec708 100644 --- a/tests/libtest/lib557.c +++ b/tests/libtest/lib557.c @@ -15,6 +15,8 @@ #include "test.h" +#include "memdebug.h" + int curl_msprintf(char *buffer, const char *format, ...); diff --git a/tests/libtest/testutil.c b/tests/libtest/testutil.c index 573e6faed..a70652626 100644 --- a/tests/libtest/testutil.c +++ b/tests/libtest/testutil.c @@ -24,6 +24,7 @@ #include "setup.h" #include "testutil.h" +#include "memdebug.h" #if defined(WIN32) && !defined(MSDOS) |