]> git.ipfire.org Git - thirdparty/curl.git/commitdiff
TrackMemory tests: always remove CR before LF
authorMarcel Raad <Marcel.Raad@teamviewer.com>
Mon, 6 Jan 2020 10:11:50 +0000 (11:11 +0100)
committerMarcel Raad <Marcel.Raad@teamviewer.com>
Mon, 6 Jan 2020 19:56:27 +0000 (20:56 +0100)
It was removed for output containing ' =' via `s/ =.*//`. With classic
MinGW, this made lines with `free()` end with CRLF, but lines with e.g.
`malloc()` end with only LF. The tests expect LF only.

Closes https://github.com/curl/curl/pull/4788

tests/data/test1330
tests/data/test558

index 1fb5a66876e5248d5b29468f529b8c7fb087c336..a78dc30b8de4d63b90f1741dad540eecc4e281dd 100644 (file)
@@ -45,6 +45,7 @@ s/ =.*//
 s/\(.*\)/()/
 s/:\d+/:/
 s:^(MEM )(.*/)(.*):$1$3:
+s/\r\n/\n/
 </stripfile>
 </verify>
 
index 44361862e695b97470624568da555a84be981307..49ef1c70be44e20ee5225efb8addb0874b172df4 100644 (file)
@@ -51,6 +51,7 @@ s/ =.*//
 s/\(.*\)/()/
 s/:\d+/:/
 s:^(MEM |FD )(.*/)(.*):$1$3:
+s/\r\n/\n/
 </stripfile>
 </verify>