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 9f23c8f201 #14541
Follow-up to 94c596bbc5 #16283

Closes #16289
This commit is contained in:
Viktor Szakats 2025-02-10 19:39:41 +01:00
parent 71ace9f3c1
commit e9be5ff61d
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
4 changed files with 3 additions and 8 deletions

View File

@ -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}")

View File

@ -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]$//

View File

@ -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]$//

View File

@ -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");
}