From 4b29be7216daa5921aae340388ef6416b1631f0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torbj=C3=B6rn=20SVENSSON?= <torbjorn.svensson@foss.st.com>
Date: Sat, 11 Jan 2025 19:16:57 +0100
Subject: [PATCH] testsuite: The expect framework might introduce CR in output
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
When running tests using the "sim" config, the command is launched in
non-readonly mode and the text retrieved from the expect command will
then replace all LF with CRLF. (The problem can be found in sim_load
where it calls remote_spawn without an input file).
libstdc++-v3/ChangeLog:
* testsuite/27_io/print/1.cc: Allow both LF and CRLF in test.
* testsuite/27_io/print/3.cc: Likewise.
Signed-off-by: Torbjörn SVENSSON <torbjorn.svensson@foss.st.com>
---
libstdc++-v3/testsuite/27_io/print/1.cc | 2 +-
libstdc++-v3/testsuite/27_io/print/3.cc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/libstdc++-v3/testsuite/27_io/print/1.cc b/libstdc++-v3/testsuite/27_io/print/1.cc
index f6585d9880ae..2a74e5002f44 100644
--- a/libstdc++-v3/testsuite/27_io/print/1.cc
+++ b/libstdc++-v3/testsuite/27_io/print/1.cc
@@ -18,7 +18,7 @@ void
test_println_default()
{
std::println("I walk the line");
- // { dg-output "I walk the line\n" }
+ // { dg-output "I walk the line\r?\n" }
}
void
diff --git a/libstdc++-v3/testsuite/27_io/print/3.cc b/libstdc++-v3/testsuite/27_io/print/3.cc
index ffcf7337ce5d..90c4cfb0d48d 100644
--- a/libstdc++-v3/testsuite/27_io/print/3.cc
+++ b/libstdc++-v3/testsuite/27_io/print/3.cc
@@ -13,7 +13,7 @@ test_println_blank()
std::print("1");
std::println();
std::println("2");
- // { dg-output "1\n2" }
+ // { dg-output "1\r?\n2" }
}
void
--
GitLab