aboutsummaryrefslogtreecommitdiff
path: root/tests/server
diff options
context:
space:
mode:
Diffstat (limited to 'tests/server')
-rw-r--r--tests/server/Makefile.inc113
-rw-r--r--tests/server/rtspd.c3
-rw-r--r--tests/server/sockfilt.c5
-rw-r--r--tests/server/sws.c3
-rw-r--r--tests/server/tftpd.c3
5 files changed, 42 insertions, 85 deletions
diff --git a/tests/server/Makefile.inc b/tests/server/Makefile.inc
index 88c5ccfaa..94e9e7514 100644
--- a/tests/server/Makefile.inc
+++ b/tests/server/Makefile.inc
@@ -1,100 +1,61 @@
noinst_PROGRAMS = getpart resolve rtspd sockfilt sws tftpd
-getpart_SOURCES = testpart.c \
- getpart.c \
- getpart.h \
- $(top_srcdir)/lib/base64.c \
- $(top_srcdir)/lib/base64.h \
- $(top_srcdir)/lib/curlx.h \
- $(top_srcdir)/lib/memdebug.c \
- $(top_srcdir)/lib/memdebug.h \
+CURLX_SRCS = \
$(top_srcdir)/lib/mprintf.c \
- $(top_srcdir)/lib/warnless.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
+
+CURLX_HDRS = \
+ $(top_srcdir)/lib/curlx.h \
+ $(top_srcdir)/lib/nonblock.h \
+ $(top_srcdir)/lib/strequal.h \
+ $(top_srcdir)/lib/strtoofft.h \
+ $(top_srcdir)/lib/timeval.h \
$(top_srcdir)/lib/warnless.h
-getpart_LDADD = @TEST_SERVER_LIBS@
-getpart_CFLAGS = $(AM_CFLAGS)
-resolve_SOURCES = resolve.c \
+USEFUL = \
getpart.c \
getpart.h \
$(top_srcdir)/lib/base64.c \
$(top_srcdir)/lib/base64.h \
- $(top_srcdir)/lib/curlx.h \
$(top_srcdir)/lib/memdebug.c \
- $(top_srcdir)/lib/memdebug.h \
- $(top_srcdir)/lib/mprintf.c \
- $(top_srcdir)/lib/warnless.c \
- $(top_srcdir)/lib/warnless.h
+ $(top_srcdir)/lib/memdebug.h
+
+UTIL = \
+ util.c \
+ util.h
+
+getpart_SOURCES = $(CURLX_SRCS) $(CURLX_HDRS) $(USEFUL) \
+ testpart.c
+getpart_LDADD = @TEST_SERVER_LIBS@
+getpart_CFLAGS = $(AM_CFLAGS)
+
+resolve_SOURCES = $(CURLX_SRCS) $(CURLX_HDRS) $(USEFUL) $(UTIL) \
+ resolve.c
resolve_LDADD = @TEST_SERVER_LIBS@
resolve_CFLAGS = $(AM_CFLAGS)
-rtspd_SOURCES = rtspd.c \
- getpart.c \
- getpart.h \
- util.c \
- util.h \
- $(top_srcdir)/lib/base64.c \
- $(top_srcdir)/lib/base64.h \
- $(top_srcdir)/lib/curlx.h \
- $(top_srcdir)/lib/memdebug.c \
- $(top_srcdir)/lib/memdebug.h \
- $(top_srcdir)/lib/mprintf.c \
- $(top_srcdir)/lib/strequal.c \
- $(top_srcdir)/lib/timeval.c \
- $(top_srcdir)/lib/warnless.c \
- $(top_srcdir)/lib/warnless.h
+rtspd_SOURCES = $(CURLX_SRCS) $(CURLX_HDRS) $(USEFUL) $(UTIL) \
+ rtspd.c
rtspd_LDADD = @TEST_SERVER_LIBS@
rtspd_CFLAGS = $(AM_CFLAGS)
-sockfilt_SOURCES = sockfilt.c \
- getpart.c \
- getpart.h \
- util.c \
- util.h \
- $(top_srcdir)/lib/base64.c \
- $(top_srcdir)/lib/base64.h \
- $(top_srcdir)/lib/curlx.h \
- $(top_srcdir)/lib/inet_pton.c \
- $(top_srcdir)/lib/memdebug.c \
- $(top_srcdir)/lib/memdebug.h \
- $(top_srcdir)/lib/mprintf.c \
- $(top_srcdir)/lib/timeval.c \
- $(top_srcdir)/lib/warnless.c \
- $(top_srcdir)/lib/warnless.h
+sockfilt_SOURCES = $(CURLX_SRCS) $(CURLX_HDRS) $(USEFUL) $(UTIL) \
+ sockfilt.c \
+ $(top_srcdir)/lib/inet_pton.c
sockfilt_LDADD = @TEST_SERVER_LIBS@
sockfilt_CFLAGS = $(AM_CFLAGS)
-sws_SOURCES = sws.c \
- getpart.c \
- getpart.h \
- util.c \
- util.h \
- $(top_srcdir)/lib/base64.c \
- $(top_srcdir)/lib/base64.h \
- $(top_srcdir)/lib/curlx.h \
- $(top_srcdir)/lib/memdebug.c \
- $(top_srcdir)/lib/memdebug.h \
- $(top_srcdir)/lib/mprintf.c \
- $(top_srcdir)/lib/strequal.c \
- $(top_srcdir)/lib/timeval.c \
- $(top_srcdir)/lib/warnless.c \
- $(top_srcdir)/lib/warnless.h
+sws_SOURCES = $(CURLX_SRCS) $(CURLX_HDRS) $(USEFUL) $(UTIL) \
+ sws.c
sws_LDADD = @TEST_SERVER_LIBS@
sws_CFLAGS = $(AM_CFLAGS)
-tftpd_SOURCES = tftpd.c tftp.h \
- getpart.c \
- getpart.h \
- util.c \
- util.h \
- $(top_srcdir)/lib/base64.c \
- $(top_srcdir)/lib/base64.h \
- $(top_srcdir)/lib/curlx.h \
- $(top_srcdir)/lib/memdebug.c \
- $(top_srcdir)/lib/memdebug.h \
- $(top_srcdir)/lib/mprintf.c \
- $(top_srcdir)/lib/timeval.c \
- $(top_srcdir)/lib/warnless.c \
- $(top_srcdir)/lib/warnless.h
+tftpd_SOURCES = $(CURLX_SRCS) $(CURLX_HDRS) $(USEFUL) $(UTIL) \
+ tftpd.c \
+ tftp.h
tftpd_LDADD = @TEST_SERVER_LIBS@
tftpd_CFLAGS = $(AM_CFLAGS)
diff --git a/tests/server/rtspd.c b/tests/server/rtspd.c
index 4c5e6a107..4d2c639be 100644
--- a/tests/server/rtspd.c
+++ b/tests/server/rtspd.c
@@ -59,7 +59,6 @@
#include "curlx.h" /* from the private lib dir */
#include "getpart.h"
#include "util.h"
-#include "warnless.h"
/* include memdebug.h last */
#include "memdebug.h"
@@ -1235,7 +1234,7 @@ int main(int argc, char *argv[])
argv[arg]);
return 0;
}
- port = Curl_ultous(ulnum);
+ port = curlx_ultous(ulnum);
arg++;
}
}
diff --git a/tests/server/sockfilt.c b/tests/server/sockfilt.c
index 50e91f41d..63c0c663c 100644
--- a/tests/server/sockfilt.c
+++ b/tests/server/sockfilt.c
@@ -110,7 +110,6 @@
#include "getpart.h"
#include "inet_pton.h"
#include "util.h"
-#include "warnless.h"
/* include memdebug.h last */
#include "memdebug.h"
@@ -899,7 +898,7 @@ int main(int argc, char *argv[])
argv[arg]);
return 0;
}
- port = Curl_ultous(ulnum);
+ port = curlx_ultous(ulnum);
arg++;
}
}
@@ -916,7 +915,7 @@ int main(int argc, char *argv[])
argv[arg]);
return 0;
}
- connectport = Curl_ultous(ulnum);
+ connectport = curlx_ultous(ulnum);
arg++;
}
}
diff --git a/tests/server/sws.c b/tests/server/sws.c
index 14058e548..56345c1e5 100644
--- a/tests/server/sws.c
+++ b/tests/server/sws.c
@@ -60,7 +60,6 @@
#include "curlx.h" /* from the private lib dir */
#include "getpart.h"
#include "util.h"
-#include "warnless.h"
/* include memdebug.h last */
#include "memdebug.h"
@@ -1139,7 +1138,7 @@ int main(int argc, char *argv[])
argv[arg]);
return 0;
}
- port = Curl_ultous(ulnum);
+ port = curlx_ultous(ulnum);
arg++;
}
}
diff --git a/tests/server/tftpd.c b/tests/server/tftpd.c
index 97669896c..a06b815b7 100644
--- a/tests/server/tftpd.c
+++ b/tests/server/tftpd.c
@@ -97,7 +97,6 @@
#include "curlx.h" /* from the private lib dir */
#include "getpart.h"
#include "util.h"
-#include "warnless.h"
/* include memdebug.h last */
#include "memdebug.h"
@@ -717,7 +716,7 @@ int main(int argc, char **argv)
argv[arg]);
return 0;
}
- port = Curl_ultous(ulnum);
+ port = curlx_ultous(ulnum);
arg++;
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 06:22:40 +0000