tests/server: remove TEST use, include <memdebug.h>

- The TEST define is never set
- memdebug.h is not in the local dir, using angle bracket include

Closes #17323

diff --git a/tests/server/dnsd.c b/tests/server/dnsd.c
index dce05c63eca0233683b206b0511e8f75d3e7c0bb..85c5c7e70c9ae542f85f6652e661cee870e2762d 100644 (file)
--- a/tests/server/dnsd.c
+++ b/tests/server/dnsd.c
@@ -57,7 +57,7 @@
 #include "server_sockaddr.h"
 
 /* include memdebug.h last */
-#include "memdebug.h"
+#include <memdebug.h>
 
 static int dnsd_wrotepidfile = 0;
 static int dnsd_wroteportfile = 0;

diff --git a/tests/server/getpart.c b/tests/server/getpart.c
index feebace526d74674352925f34d56369fbae08ce5..a6408c4a55f548b01efac53f2e7c4e65f95b4188 100644 (file)
--- a/tests/server/getpart.c
+++ b/tests/server/getpart.c
@@ -25,19 +25,11 @@
 
 #include "getpart.h"
 
-#ifdef TEST
-#include "curl/curl.h"
-#include "warnless.h"
-#else
 #include <curlx.h> /* from the private lib dir */
-#endif
-
 #include "curl_memory.h"
 
-#ifndef TEST
 /* include memdebug.h last */
-#include "memdebug.h"
-#endif
+#include <memdebug.h>
 
 #define EAT_SPACE(p) while(*(p) && ISSPACE(*(p))) (p)++
 
@@ -491,29 +483,3 @@ int getpart(char **outbuf, size_t *outlen,
 
   return error;
 }
-
-#ifdef TEST
-#include "../../lib/base64.c"
-#include "../../lib/warnless.c"
-/* Build with:
- * $ gcc getpart.c -DTEST -I../../include -I../../lib -DHAVE_CONFIG_H
- */
-int main(int argc, char **argv)
-{
-  if(argc < 3) {
-    printf("./getpart main sub\n");
-  }
-  else {
-    char  *part;
-    size_t partlen;
-    int rc = getpart(&part, &partlen, argv[1], argv[2], stdin);
-    size_t i;
-    if(rc)
-      return rc;
-    for(i = 0; i < partlen; i++)
-      printf("%c", part[i]);
-    free(part);
-  }
-  return 0;
-}
-#endif

diff --git a/tests/server/mqttd.c b/tests/server/mqttd.c
index 4fdc67c8afd106e9f0d8fa76f80d9e8dc977da8d..1aa1d83b80268a6ec6f6f98af5ea47d9af64efe0 100644 (file)
--- a/tests/server/mqttd.c
+++ b/tests/server/mqttd.c
@@ -60,7 +60,7 @@
 #include "tool_binmode.h"
 
 /* include memdebug.h last */
-#include "memdebug.h"
+#include <memdebug.h>
 
 #define MQTT_MSG_CONNECT    0x10
 #define MQTT_MSG_CONNACK    0x20

diff --git a/tests/server/resolve.c b/tests/server/resolve.c
index e7f2f84aecb7672035d4be7072b2b55ac93462e0..b69c87c1fa8905937bd7acbc3645e7a4c2814409 100644 (file)
--- a/tests/server/resolve.c
+++ b/tests/server/resolve.c
@@ -47,7 +47,7 @@
 #include "util.h"
 
 /* include memdebug.h last */
-#include "memdebug.h"
+#include <memdebug.h>
 
 int main(int argc, char *argv[])
 {

diff --git a/tests/server/rtspd.c b/tests/server/rtspd.c
index 65b8b09f0299d14224f62ac1efd6dea5c38127f6..0f716fe04818830e7013582ad6bffaff832f420e 100644 (file)
--- a/tests/server/rtspd.c
+++ b/tests/server/rtspd.c
@@ -54,7 +54,7 @@
 #include "server_sockaddr.h"
 
 /* include memdebug.h last */
-#include "memdebug.h"
+#include <memdebug.h>
 
 #undef REQBUFSIZ
 #define REQBUFSIZ 150000

diff --git a/tests/server/sockfilt.c b/tests/server/sockfilt.c
index 7ce7e0966dc74a7c73781f5cfb702ff0cecd2f33..9399c2decd4285ee2e2c2bc3a8307999af2b1d36 100644 (file)
--- a/tests/server/sockfilt.c
+++ b/tests/server/sockfilt.c
@@ -110,7 +110,7 @@
 #include "tool_binmode.h"
 
 /* include memdebug.h last */
-#include "memdebug.h"
+#include <memdebug.h>
 
 /* buffer is this excessively large only to be able to support things like
   test 1003 which tests exceedingly large server response lines */

diff --git a/tests/server/socksd.c b/tests/server/socksd.c
index cd12a3d07c4f9a273bfcb57635822c67b9573b93..1d34e12602b89c813adada50c69d4bc0bee63a4f 100644 (file)
--- a/tests/server/socksd.c
+++ b/tests/server/socksd.c
@@ -80,7 +80,7 @@
 #include "tool_binmode.h"
 
 /* include memdebug.h last */
-#include "memdebug.h"
+#include <memdebug.h>
 
 static const char *backendaddr = "127.0.0.1";
 static unsigned short backendport = 0; /* default is use client's */

diff --git a/tests/server/sws.c b/tests/server/sws.c
index 15ae75e4c7f1c811202e824604ca06a05fa7141e..57d40be147783ff83d3acb714140964eb98f0e67 100644 (file)
--- a/tests/server/sws.c
+++ b/tests/server/sws.c
@@ -56,7 +56,7 @@
 #include "server_sockaddr.h"
 
 /* include memdebug.h last */
-#include "memdebug.h"
+#include <memdebug.h>
 
 static bool use_gopher = FALSE;
 static bool is_proxy = FALSE;

diff --git a/tests/server/tftpd.c b/tests/server/tftpd.c
index f969175467f9f89f4873ec2a2f93b663b4a0ae9d..c5cb84a5bdddc0bbf2cffb08b55e78d57d8ed78c 100644 (file)
--- a/tests/server/tftpd.c
+++ b/tests/server/tftpd.c
@@ -90,7 +90,7 @@
 #include "tftp.h"
 
 /* include memdebug.h last */
-#include "memdebug.h"
+#include <memdebug.h>
 
 /*****************************************************************************
 *                      STRUCT DECLARATIONS AND DEFINES                       *