From: Viktor Szakats <commit@vsz.me>
Date: Mon, 10 Feb 2025 18:39:41 +0000 (+0100)
Subject: tests: fix test 558, 1330 for MSVC, allow TrackMemory with MSVC in cmake
X-Git-Tag: curl-8_12_1~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e9be5ff61ddf8f1c02213f200fd36fbd0524933e;p=thirdparty%2Fcurl.git

tests: fix test 558, 1330 for MSVC, allow TrackMemory with MSVC in cmake

Extend output filter to pick up backslashes. This makes them pass in CI
when run in the vcpkg MSVC job, for example.

Also:
- cmake: allow TrackMemory, aka `ENABLE_CURLDEBUG` again. Drop FIXME.
- cmake: drop stale TODO.
- runtests: include the word 'TrackMemory' in the message disabling it.

Follow-up to 9f23c8f201f55f1a148b41b16a5e71f3385faa5e #14541
Follow-up to 94c596bbc588ff5f37390754be778c47cd70cc91 #16283

Closes #16289
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6b4cc160a8..239a2c9e72 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -265,10 +265,6 @@ if(ENABLE_DEBUG)
 endif()
 option(ENABLE_CURLDEBUG "Enable TrackMemory debug feature" ${ENABLE_DEBUG})
 
-if(MSVC)
-  set(ENABLE_CURLDEBUG OFF)  # FIXME: TrackMemory + MSVC fails test 558 and 1330. Tested with static build, Debug mode.
-endif()
-
 if(ENABLE_DEBUG)
   set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS "DEBUGBUILD")
 endif()
@@ -2196,7 +2192,6 @@ if(NOT CURL_DISABLE_INSTALL)
 
   # curl-config needs the following options to be set.
   set(CC                      "${CMAKE_C_COMPILER}")
-  # TODO: probably put a -D... options here?
   set(CONFIGURE_OPTIONS       "")
   set(CURLVERSION             "${_curl_version}")
   set(VERSIONNUM              "${_curl_version_num}")
diff --git a/tests/data/test1330 b/tests/data/test1330
index 0dd8f7d267..4e97162b54 100644
--- a/tests/data/test1330
+++ b/tests/data/test1330
@@ -39,7 +39,7 @@ MEM unit%TESTNUMBER.c: free()
 s/ =.*//
 s/\(.*\)/()/
 s/:\d+/:/
-s:^(MEM )(.*/)(.*):$1$3:
+s:^(MEM )(.*[/\\])(.*):$1$3:
 s/\r\n/\n/
 s/^MEM getenv.c: realloc\(\)[\n]$//
 s/^MEM getenv.c: free\(\)[\n]$//
diff --git a/tests/data/test558 b/tests/data/test558
index 47605de0b0..a7d6129e92 100644
--- a/tests/data/test558
+++ b/tests/data/test558
@@ -49,7 +49,7 @@ s/^MEM escape.c:\d+ free\(\(nil\)\)[\n]$//
 s/ =.*//
 s/\(.*\)/()/
 s/:\d+/:/
-s:^(MEM |FD )(.*/)(.*):$1$3:
+s:^(MEM |FD )(.*[/\\])(.*):$1$3:
 s/\r\n/\n/
 s/^MEM getenv.c: realloc\(\)[\n]$//
 s/^MEM getenv.c: free\(\)[\n]$//
diff --git a/tests/runtests.pl b/tests/runtests.pl
index 0ca69fec4c..35c1b12149 100755
--- a/tests/runtests.pl
+++ b/tests/runtests.pl
@@ -866,7 +866,7 @@ sub checksystemfeatures {
     }
     if($feature{"TrackMemory"} && $feature{"threaded-resolver"}) {
         logmsg("*\n",
-               "*** DISABLES memory tracking when using threaded resolver\n",
+               "*** DISABLES TrackMemory (memory tracking) when using threaded resolver\n",
                "*\n");
     }