From: Yuriy Kolerov <kolerov93@gmail.com>
Date: Tue, 13 Feb 2024 06:40:22 +0000 (+0000)
Subject: arc: Don't use multiline in arc-disassembler-options.exp test
X-Git-Tag: gdb-15-branchpoint~980
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fd07bcb16f1d0891b66931e0930a74355be12bb6;p=thirdparty%2Fbinutils-gdb.git

arc: Don't use multiline in arc-disassembler-options.exp test

Breaking a TCL string to several lines leads to adding of extra
symbols to the resulting expect string. In turn, this leads to
failing of all test cases in gdb.arch/arc-disassembler-options.exp
testsuite. It's necessary to use multi_line function in such
cases.

Approved-By: Tom Tromey <tom@tromey.com>
---

diff --git a/gdb/testsuite/gdb.arch/arc-disassembler-options.exp b/gdb/testsuite/gdb.arch/arc-disassembler-options.exp
index 29c7e60b487..3a4c5234891 100644
--- a/gdb/testsuite/gdb.arch/arc-disassembler-options.exp
+++ b/gdb/testsuite/gdb.arch/arc-disassembler-options.exp
@@ -28,10 +28,11 @@ if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${objfile}" object {}] \
 clean_restart ${objfile}
 
 proc arc_disassemble_test { func insn mesg } {
-    gdb_test "disassemble $func" \
-	"Dump of assembler code for function $func:\r\n\
-	\[^:\]+:\t$insn\r\nEnd of assembler dump\." \
-	$mesg
+    set pass_re [multi_line \
+			"Dump of assembler code for function $func:" \
+			"\[^:\]+:\t$insn" \
+			"End of assembler dump\\."]
+    gdb_test "disassemble $func" $pass_re $mesg
 }
 
 # Verify defaults.