public inbox for gdb-cvs@sourceware.org
help / color / mirror / Atom feed
From: Shahab Vahedi <shahab@sourceware.org>
To: gdb-cvs@sourceware.org
Subject: [binutils-gdb] arc: Don't use multiline in arc-disassembler-options.exp test
Date: Tue, 13 Feb 2024 21:49:08 +0000 (GMT)	[thread overview]
Message-ID: <20240213214910.A4FA73857C7D@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=fd07bcb16f1d0891b66931e0930a74355be12bb6

commit fd07bcb16f1d0891b66931e0930a74355be12bb6
Author: Yuriy Kolerov <kolerov93@gmail.com>
Date:   Tue Feb 13 06:40:22 2024 +0000

    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:
---
 gdb/testsuite/gdb.arch/arc-disassembler-options.exp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

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.

                 reply	other threads:[~2024-02-13 21:49 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240213214910.A4FA73857C7D@sourceware.org \
    --to=shahab@sourceware.org \
    --cc=gdb-cvs@sourceware.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).