Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Closed
wants to merge 6 commits into from

Conversation

vszakats
Copy link
Member

@vszakats vszakats commented Feb 10, 2025

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

```
  test 0558...[libtest memory tracking operational]

   558: output (log/3/memdump) FAILED:
  --- log/3/check-expected	2025-02-10 18:45:52.958248400 +0000
  +++ log/3/check-generated	2025-02-10 18:45:52.958248400 +0000
  @@ -1,6 +1,6 @@
   MEM easy.c: malloc()[LF]
  -MEM lib558.c: malloc()[LF]
  -MEM lib558.c: free()[LF]
  +MEM D:\a\curl\curl\tests\libtest\lib558.c: malloc()[LF]
  +MEM D:\a\curl\curl\tests\libtest\lib558.c: free()[LF]
   MEM dynbuf.c: realloc()[LF]
   MEM dynbuf.c: realloc()[LF]
   MEM escape.c: free()[LF]
  == Contents of files in the log/3/ dir after test 558
  === Start of file check-expected
   MEM easy.c: malloc()[LF]
   MEM lib558.c: malloc()[LF]
   MEM lib558.c: free()[LF]
   MEM dynbuf.c: realloc()[LF]
   MEM dynbuf.c: realloc()[LF]
   MEM escape.c: free()[LF]
   MEM easy.c: free()[LF]
  === End of file check-expected
  === Start of file check-generated
   MEM easy.c: malloc()[LF]
   MEM D:\a\curl\curl\tests\libtest\lib558.c: malloc()[LF]
   MEM D:\a\curl\curl\tests\libtest\lib558.c: free()[LF]
   MEM dynbuf.c: realloc()[LF]
   MEM dynbuf.c: realloc()[LF]
   MEM escape.c: free()[LF]
   MEM easy.c: free()[LF]
  === End of file check-generated
  === Start of file server.cmd
   Testnum 558
  === End of file server.cmd
  === Start of file stderr558
   Test: lib558
   URL: nothing
   Test ended with result 0
  === End of file stderr558
```
https://github.com/curl/curl/actions/runs/13248053540/job/36979229451?pr=16238#step:14:1185
```
  test 1330...[unit tests memory tracking operational]

   1330: output (log/7/memdump) FAILED:
  --- log/7/check-expected	2025-02-10 18:47:45.452434900 +0000
  +++ log/7/check-generated	2025-02-10 18:47:45.452434900 +0000
  @@ -1,2 +1,2 @@
  -MEM unit1330.c: malloc()[LF]
  -MEM unit1330.c: free()[LF]
  +MEM D:\a\curl\curl\tests\unit\unit1330.c: malloc()[LF]
  +MEM D:\a\curl\curl\tests\unit\unit1330.c: free()[LF]
  == Contents of files in the log/7/ dir after test 1330
  === Start of file check-expected
   MEM unit1330.c: malloc()[LF]
   MEM unit1330.c: free()[LF]
  === End of file check-expected
  === Start of file check-generated
   MEM D:\a\curl\curl\tests\unit\unit1330.c: malloc()[LF]
   MEM D:\a\curl\curl\tests\unit\unit1330.c: free()[LF]
  === End of file check-generated
  === Start of file server.cmd
   Testnum 1330
  === End of file server.cmd
  === Start of file stderr1330
   Test: unit1330
   URL: nothing
   Test ended with result 0
  === End of file stderr1330
```
@vszakats vszakats changed the title tests: fix test558, test1330 for MSVC, allow TrackMemory with MSVC in cmake tests: fix test 558, 1330 for MSVC, allow TrackMemory with MSVC in cmake Feb 10, 2025
@vszakats vszakats added the Windows Windows-specific label Feb 10, 2025
@vszakats vszakats closed this in e9be5ff Feb 10, 2025
@vszakats vszakats deleted the msvc-trackmem-test-fix branch February 10, 2025 21:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Development

Successfully merging this pull request may close these issues.

2 participants