From: Marcel Raad <Marcel.Raad@teamviewer.com>
Date: Mon, 6 Jan 2020 10:11:50 +0000 (+0100)
Subject: TrackMemory tests: always remove CR before LF
X-Git-Tag: curl-7_68_0~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8cf875ed3b0b50df2e159be778766cf246fe6fbe;p=thirdparty%2Fcurl.git

TrackMemory tests: always remove CR before LF

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
---

diff --git a/tests/data/test1330 b/tests/data/test1330
index 1fb5a66876..a78dc30b8d 100644
--- a/tests/data/test1330
+++ b/tests/data/test1330
@@ -45,6 +45,7 @@ s/ =.*//
 s/\(.*\)/()/
 s/:\d+/:/
 s:^(MEM )(.*/)(.*):$1$3:
+s/\r\n/\n/
 </stripfile>
 </verify>
 
diff --git a/tests/data/test558 b/tests/data/test558
index 44361862e6..49ef1c70be 100644
--- a/tests/data/test558
+++ b/tests/data/test558
@@ -51,6 +51,7 @@ s/ =.*//
 s/\(.*\)/()/
 s/:\d+/:/
 s:^(MEM |FD )(.*/)(.*):$1$3:
+s/\r\n/\n/
 </stripfile>
 </verify>