aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/libtest/Makefile.inc2
-rw-r--r--tests/libtest/lib518.c4
-rw-r--r--tests/libtest/lib537.c4
-rwxr-xr-xtests/memanalyze.pl16
-rw-r--r--tests/server/CMakeLists.txt12
-rw-r--r--tests/server/Makefile.inc20
6 files changed, 29 insertions, 29 deletions
diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc
index 0c45fea73..7de115ea2 100644
--- a/tests/libtest/Makefile.inc
+++ b/tests/libtest/Makefile.inc
@@ -5,7 +5,7 @@ TESTUTIL = testutil.c testutil.h
TSTTRACE = testtrace.c testtrace.h
# files used only in some libcurl test programs
-WARNLESS = $(top_srcdir)/lib/warnless.c $(top_srcdir)/lib/curl_warnless.h
+WARNLESS = $(top_srcdir)/lib/curl_warnless.c $(top_srcdir)/lib/curl_warnless.h
# these files are used in every single test program below
SUPPORTFILES = first.c test.h
diff --git a/tests/libtest/lib518.c b/tests/libtest/lib518.c
index b6b1e1d7c..f5b4eb67a 100644
--- a/tests/libtest/lib518.c
+++ b/tests/libtest/lib518.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2013, 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
@@ -386,7 +386,7 @@ static int rlimit(int keep_open)
* when using select() instead of poll() we cannot test
* libcurl functionality with a socket number equal or
* greater than FD_SETSIZE. In any case, macro VERIFY_SOCK
- * in lib/select.c enforces this check and protects libcurl
+ * in lib/curl_select.c enforces this check and protects libcurl
* from a possible crash. The effect of this protection
* is that test 518 will always fail, since the actual
* call to select() never takes place. We skip test 518
diff --git a/tests/libtest/lib537.c b/tests/libtest/lib537.c
index 2d55d480d..1c6210e84 100644
--- a/tests/libtest/lib537.c
+++ b/tests/libtest/lib537.c
@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2013, 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
@@ -389,7 +389,7 @@ static int rlimit(int keep_open)
* when using select() instead of poll() we cannot test
* libcurl functionality with a socket number equal or
* greater than FD_SETSIZE. In any case, macro VERIFY_SOCK
- * in lib/select.c enforces this check and protects libcurl
+ * in lib/curl_select.c enforces this check and protects libcurl
* from a possible crash. The effect of this protection
* is that test 537 will always fail, since the actual
* call to select() never takes place. We skip test 537
diff --git a/tests/memanalyze.pl b/tests/memanalyze.pl
index bf5393365..5f5bdfc2f 100755
--- a/tests/memanalyze.pl
+++ b/tests/memanalyze.pl
@@ -6,7 +6,7 @@
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
-# Copyright (C) 1998 - 2011, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2013, 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
@@ -23,9 +23,9 @@
#
# Example input:
#
-# MEM mprintf.c:1094 malloc(32) = e5718
-# MEM mprintf.c:1103 realloc(e5718, 64) = e6118
-# MEM sendf.c:232 free(f6520)
+# MEM curl_mprintf.c:1094 malloc(32) = e5718
+# MEM curl_mprintf.c:1103 realloc(e5718, 64) = e6118
+# MEM curl_sendf.c:232 free(f6520)
my $mallocs=0;
my $callocs=0;
@@ -224,7 +224,7 @@ while(<FILE>) {
print "Not recognized input line: $function\n";
}
}
- # FD url.c:1282 socket() = 5
+ # FD curl_url.c:1282 socket() = 5
elsif($_ =~ /^FD ([^ ]*):(\d*) (.*)/) {
# generic match for the filename+linenumber
$source = $1;
@@ -259,7 +259,7 @@ while(<FILE>) {
}
}
}
- # FILE url.c:1282 fopen("blabla") = 0x5ddd
+ # FILE curl_url.c:1282 fopen("blabla") = 0x5ddd
elsif($_ =~ /^FILE ([^ ]*):(\d*) (.*)/) {
# generic match for the filename+linenumber
$source = $1;
@@ -287,12 +287,12 @@ while(<FILE>) {
}
}
}
- # GETNAME url.c:1901 getnameinfo()
+ # GETNAME curl_url.c:1901 getnameinfo()
elsif($_ =~ /^GETNAME ([^ ]*):(\d*) (.*)/) {
# not much to do
}
- # ADDR url.c:1282 getaddrinfo() = 0x5ddd
+ # ADDR curl_url.c:1282 getaddrinfo() = 0x5ddd
elsif($_ =~ /^ADDR ([^ ]*):(\d*) (.*)/) {
# generic match for the filename+linenumber
$source = $1;
diff --git a/tests/server/CMakeLists.txt b/tests/server/CMakeLists.txt
index 2e82c1133..fc07b61d9 100644
--- a/tests/server/CMakeLists.txt
+++ b/tests/server/CMakeLists.txt
@@ -56,16 +56,16 @@ endforeach()
# SET(useful
# getpart.c getpart.h
-# ${CURL_SOURCE_DIR}/lib/strequal.c
-# ${CURL_SOURCE_DIR}/lib/base64.c
-# ${CURL_SOURCE_DIR}/lib/mprintf.c
-# ${CURL_SOURCE_DIR}/lib/memdebug.c
-# ${CURL_SOURCE_DIR}/lib/timeval.c
+# ${CURL_SOURCE_DIR}/lib/curl_strequal.c
+# ${CURL_SOURCE_DIR}/lib/curl_base64.c
+# ${CURL_SOURCE_DIR}/lib/curl_mprintf.c
+# ${CURL_SOURCE_DIR}/lib/curl_memdebug.c
+# ${CURL_SOURCE_DIR}/lib/curl_timeval.c
# )
# SETUP_EXECUTABLE(sws sws.c util.c util.h ${useful})
# SETUP_EXECUTABLE(resolve resolve.c util.c util.h ${useful})
-# SETUP_EXECUTABLE(sockfilt sockfilt.c util.c util.h ${useful} ${CURL_SOURCE_DIR}/lib/inet_pton.c)
+# SETUP_EXECUTABLE(sockfilt sockfilt.c util.c util.h ${useful} ${CURL_SOURCE_DIR}/lib/curl_inet_pton.c)
# SETUP_EXECUTABLE(getpart testpart.c ${useful})
# SETUP_EXECUTABLE(tftpd tftpd.c util.c util.h ${useful} server_tftp.h)
diff --git a/tests/server/Makefile.inc b/tests/server/Makefile.inc
index 2dbbf2660..b0c32bdf2 100644
--- a/tests/server/Makefile.inc
+++ b/tests/server/Makefile.inc
@@ -1,12 +1,12 @@
noinst_PROGRAMS = getpart resolve rtspd sockfilt sws tftpd fake_ntlm
CURLX_SRCS = \
- $(top_srcdir)/lib/mprintf.c \
- $(top_srcdir)/lib/nonblock.c \
- $(top_srcdir)/lib/strequal.c \
- $(top_srcdir)/lib/strtoofft.c \
- $(top_srcdir)/lib/timeval.c \
- $(top_srcdir)/lib/warnless.c
+ $(top_srcdir)/lib/curl_mprintf.c \
+ $(top_srcdir)/lib/curl_nonblock.c \
+ $(top_srcdir)/lib/curl_strequal.c \
+ $(top_srcdir)/lib/curl_strtoofft.c \
+ $(top_srcdir)/lib/curl_timeval.c \
+ $(top_srcdir)/lib/curl_warnless.c
CURLX_HDRS = \
$(top_srcdir)/lib/curlx.h \
@@ -20,9 +20,9 @@ USEFUL = \
getpart.c \
getpart.h \
server_setup.h \
- $(top_srcdir)/lib/base64.c \
+ $(top_srcdir)/lib/curl_base64.c \
$(top_srcdir)/lib/curl_base64.h \
- $(top_srcdir)/lib/memdebug.c \
+ $(top_srcdir)/lib/curl_memdebug.c \
$(top_srcdir)/lib/curl_memdebug.h
UTIL = \
@@ -48,14 +48,14 @@ rtspd_CFLAGS = $(AM_CFLAGS)
sockfilt_SOURCES = $(CURLX_SRCS) $(CURLX_HDRS) $(USEFUL) $(UTIL) \
server_sockaddr.h \
sockfilt.c \
- $(top_srcdir)/lib/inet_pton.c
+ $(top_srcdir)/lib/curl_inet_pton.c
sockfilt_LDADD = @CURL_NETWORK_AND_TIME_LIBS@
sockfilt_CFLAGS = $(AM_CFLAGS)
sws_SOURCES = $(CURLX_SRCS) $(CURLX_HDRS) $(USEFUL) $(UTIL) \
server_sockaddr.h \
sws.c \
- $(top_srcdir)/lib/inet_pton.c
+ $(top_srcdir)/lib/curl_inet_pton.c
sws_LDADD = @CURL_NETWORK_AND_TIME_LIBS@
sws_CFLAGS = $(AM_CFLAGS)
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 15:40:39 +0000