summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Raad <Marcel.Raad@teamviewer.com>2020-01-06 11:11:50 +0100
committerMarcel Raad <Marcel.Raad@teamviewer.com>2020-01-06 20:56:27 +0100
commit8cf875ed3b0b50df2e159be778766cf246fe6fbe (patch)
tree744ccbc4f2fa8d09a8cc20679a219ea837f97a9a
parent9275c2be8cd18af5afb2a6c95b18a6aeb5ee529d (diff)
downloadcurl-8cf875ed3b0b50df2e159be778766cf246fe6fbe.tar.gz
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
-rw-r--r--tests/data/test13301
-rw-r--r--tests/data/test5581
2 files changed, 2 insertions, 0 deletions
diff --git a/tests/data/test1330 b/tests/data/test1330
index 1fb5a6687..a78dc30b8 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 44361862e..49ef1c70b 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>