From: Daniel Stenberg <daniel@haxx.se>
Date: Mon, 12 May 2025 10:13:15 +0000 (+0200)
Subject: tests/server: remove TEST use, include <memdebug.h>
X-Git-Tag: curl-8_14_0~102
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1ef5bef055f7d6cd6359b983b107f47d4b1acf4b;p=thirdparty%2Fcurl.git

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 dce05c63ec..85c5c7e70c 100644
--- 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 feebace526..a6408c4a55 100644
--- 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 4fdc67c8af..1aa1d83b80 100644
--- 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 e7f2f84aec..b69c87c1fa 100644
--- 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 65b8b09f02..0f716fe048 100644
--- 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 7ce7e0966d..9399c2decd 100644
--- 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 cd12a3d07c..1d34e12602 100644
--- 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 15ae75e4c7..57d40be147 100644
--- 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 f969175467..c5cb84a5bd 100644
--- 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                       *