From: Tom de Vries <tdevries@suse.de>
To: gdb-patches@sourceware.org
Subject: [PATCH 1/2] [gdb/testsuite] Refactor regexp in gdb.base/annota1.exp
Date: Wed, 6 Oct 2021 17:33:06 +0200 [thread overview]
Message-ID: <20211006153307.15868-1-tdevries@suse.de> (raw)
Refactor regexp in gdb.base/annota1.exp to reduce indentation and repetition.
Tested on x86_64-linux.
---
gdb/testsuite/gdb.base/annota1.exp | 56 +++++++++++++++++++-----------
1 file changed, 35 insertions(+), 21 deletions(-)
diff --git a/gdb/testsuite/gdb.base/annota1.exp b/gdb/testsuite/gdb.base/annota1.exp
index 13c9a48bba8..7a08137a1b0 100644
--- a/gdb/testsuite/gdb.base/annota1.exp
+++ b/gdb/testsuite/gdb.base/annota1.exp
@@ -127,29 +127,43 @@ gdb_test_multiple "info break" "breakpoint info" {
#exp_internal 1
set binexp [string_to_regexp $binfile]
-set run_re [join [list "\r\n\032\032post-prompt\r\nStarting program: $binexp " \
- "\(\(\r\nReading \[^\r\n\]+\)|\(\r\nwarning: File transfers from remote targets can be slow\[^\r\n\]+\)\)*" \
- "\(\r\nwarning: Skipping \[^\r\n\]+ .gdb_index section in \[^\r\n\]+\r\nDo \"set use-deprecated-index-sections on\" before the file is read\r\nto use the section anyway\\.\)?" \
- "\(\(\r\n\r\n\032\032frames-invalid\)|\(\r\n\r\n\032\032breakpoints-invalid\)\)*\r\n\r\n" \
- "\032\032starting\(\(\r\nReading \[^\r\n\]+\)|\(\r\nwarning: File transfers from remote targets can be slow\[^\r\n\]+\)\)*" \
- "\(\(\r\n\r\n\032\032frames-invalid\)|\(\r\n\r\n\032\032breakpoints-invalid\)\)*\r\n\r\n" \
- "\032\032breakpoint 1\r\n\r\n" \
- "Breakpoint 1, \r\n" \
- "\032\032frame-begin 0 $hex\r\n\r\n" \
- "\032\032frame-function-name\r\n" \
- "main\r\n" \
- "\032\032frame-args\r\n \\(\\)\r\n" \
- "\032\032frame-source-begin\r\n at \r\n" \
- "\032\032frame-source-file\r\n.*annota1.c\r\n" \
- "\032\032frame-source-file-end\r\n:\r\n" \
- "\032\032frame-source-line\r\n$main_line\r\n" \
- "\032\032frame-source-end\r\n\r\n\r\n" \
- "\032\032source.*$srcfile:$main_line:.*:beg:$hex\r\n\r\n" \
- "\032\032frame-end\r\n\r\n" \
- "\032\032stopped.*$gdb_prompt$" ] "" ]
+set warning_slow_re \
+ "warning: File transfers from remote targets can be slow\[^\r\n\]+"
+set warning_gdb_index_re \
+ [multi_line \
+ "warning: Skipping \[^\r\n\]+ .gdb_index section in \[^\r\n\]+" \
+ "Do \"set use-deprecated-index-sections on\" before the file is read" \
+ "to use the section anyway\\."]
+set reading_re \
+ "Reading \[^\r\n\]+"
+
+set run_re \
+ [list \
+ "\r\n\032\032post-prompt\r\nStarting program: $binexp " \
+ "\(\(\r\n$reading_re\)|\(\r\n$warning_slow_re\)\)*" \
+ "\(\r\n$warning_gdb_index_re\)?" \
+ "\(\(\r\n\r\n\032\032frames-invalid\)|\(\r\n\r\n\032\032breakpoints-invalid\)\)*\r\n\r\n" \
+ "\032\032starting\(\(\r\n$reading_re\)|\(\r\n$warning_slow_re\)\)*" \
+ "\(\(\r\n\r\n\032\032frames-invalid\)|\(\r\n\r\n\032\032breakpoints-invalid\)\)*\r\n\r\n" \
+ "\032\032breakpoint 1\r\n\r\n" \
+ "Breakpoint 1, \r\n" \
+ "\032\032frame-begin 0 $hex\r\n\r\n" \
+ "\032\032frame-function-name\r\n" \
+ "main\r\n" \
+ "\032\032frame-args\r\n \\(\\)\r\n" \
+ "\032\032frame-source-begin\r\n at \r\n" \
+ "\032\032frame-source-file\r\n.*annota1.c\r\n" \
+ "\032\032frame-source-file-end\r\n:\r\n" \
+ "\032\032frame-source-line\r\n$main_line\r\n" \
+ "\032\032frame-source-end\r\n\r\n\r\n" \
+ "\032\032source.*$srcfile:$main_line:.*:beg:$hex\r\n\r\n" \
+ "\032\032frame-end\r\n\r\n" \
+ "\032\032stopped"]
+
+set run_re [join $run_re ""]
gdb_test_multiple "run" "run until main breakpoint" {
- -re $run_re {
+ -re $run_re.*$gdb_prompt$ {
pass $gdb_test_name
}
}
base-commit: cf2ad3e66286c9f3dc8cb6cf74a2af761cb7a49f
--
2.26.2
next reply other threads:[~2021-10-06 15:33 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-06 15:33 Tom de Vries [this message]
2021-10-06 15:33 ` [PATCH 2/2] [gdb/testsuite] Fix FAIL " Tom de Vries
2021-10-06 20:51 ` Simon Marchi
2021-10-07 3:43 ` Tom de Vries
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=20211006153307.15868-1-tdevries@suse.de \
--to=tdevries@suse.de \
--cc=gdb-patches@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).