From: Lancelot SIX <lsix@lancelotsix.com>
To: gdb-patches@sourceware.org
Cc: Lancelot SIX <lsix@lancelotsix.com>
Subject: [PATCH 09/29] gdb/testsuite: Remove duplicates from gdb.base/solib-display.exp
Date: Sun, 21 Nov 2021 17:56:16 +0000 [thread overview]
Message-ID: <20211121175636.779325-10-lsix@lancelotsix.com> (raw)
In-Reply-To: <20211121175636.779325-1-lsix@lancelotsix.com>
When running the testsuite, I have:
Running .../gdb/testsuite/gdb.base/solib-display.exp ...
DUPLICATE: gdb.base/solib-display.exp: NO: break 25
DUPLICATE: gdb.base/solib-display.exp: NO: continue
DUPLICATE: gdb.base/solib-display.exp: IN: break 25
DUPLICATE: gdb.base/solib-display.exp: IN: continue
DUPLICATE: gdb.base/solib-display.exp: SEP: break 25
DUPLICATE: gdb.base/solib-display.exp: SEP: continue
The 'break 25' appears because the test inserts two breakpoints at the
same location. Fix this by only inserting the breakpoint once.
Fix the 'continue' DUPLICATE by giving a phony name to the second
continue: 'continue two'.
While at it, this commit also removes a trailing space.
Tested on x86_64-linux.
---
gdb/testsuite/gdb.base/solib-display.exp | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/gdb/testsuite/gdb.base/solib-display.exp b/gdb/testsuite/gdb.base/solib-display.exp
index 54de334357f..f075b295899 100644
--- a/gdb/testsuite/gdb.base/solib-display.exp
+++ b/gdb/testsuite/gdb.base/solib-display.exp
@@ -140,7 +140,7 @@ foreach libsepdebug {NO IN SEP} { with_test_prefix "$libsepdebug" {
# are not cleared permaturely.
gdb_test "break [gdb_get_line_number "break here" ${testfile}.c]" \
- ".*Breakpoint.* at .*"
+ ".*Breakpoint.* at .*"
gdb_test "continue"
gdb_test "display main_global" "4: main_global = 44"
@@ -153,11 +153,9 @@ foreach libsepdebug {NO IN SEP} { with_test_prefix "$libsepdebug" {
}
gdb_test "" "6: a_static = 46\\r\\n4: main_global = 44\\r\\n.*"
- gdb_test "break [gdb_get_line_number "break here" ${testfile}.c]" \
- ".*Breakpoint.* at .*"
gdb_test "continue" [multi_line \
"4: main_global = 44" \
"5: a_local = 45" \
"6: a_static = 46" \
- ]
+ ] "continue two"
}}
--
2.33.1
next prev parent reply other threads:[~2021-11-21 17:57 UTC|newest]
Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-21 17:56 [PATCH 00/29] Remove DUPLICATEs from testsuite/gdb.base/*.exp Lancelot SIX
2021-11-21 17:56 ` [PATCH 01/29] gdb/testsuite: Remove duplicates from gdb.base/stack-checking.exp Lancelot SIX
2022-01-04 13:59 ` Andrew Burgess
2021-11-21 17:56 ` [PATCH 02/29] gdb/testsuite: Remove duplicates from gdb.base/miscexprs.exp Lancelot SIX
2021-12-10 22:06 ` Pedro Alves
2021-12-14 23:28 ` Lancelot SIX
2021-12-15 11:52 ` Pedro Alves
2022-01-04 14:00 ` Andrew Burgess
2021-11-21 17:56 ` [PATCH 03/29] gdb/testsuite: Remove duplicates from gdb.base/interp.exp Lancelot SIX
2021-11-22 14:13 ` Pedro Alves
2021-11-22 17:33 ` Lancelot SIX
2021-12-10 22:01 ` Pedro Alves
2021-11-21 17:56 ` [PATCH 04/29] gdb/testsuite: Remove duplicates from gdb.base/realname-expand.exp Lancelot SIX
2022-01-04 14:06 ` Andrew Burgess
2021-11-21 17:56 ` [PATCH 05/29] gdb/testsuite: Remove duplicates from gdb.base/pie-fork.exp Lancelot SIX
2022-01-04 14:07 ` Andrew Burgess
2021-11-21 17:56 ` [PATCH 06/29] gdb/testsuite: Remove duplicates from gdb.base/checkpoint.exp Lancelot SIX
2022-01-04 14:11 ` Andrew Burgess
2021-11-21 17:56 ` [PATCH 07/29] gdb/testsuite: Remove duplicates from gdb.base/pending.exp Lancelot SIX
2022-01-04 14:12 ` Andrew Burgess
2021-11-21 17:56 ` [PATCH 08/29] gdb/testsuite: Remove duplicates from gdb.base/decl-before-def.exp Lancelot SIX
2022-01-04 14:13 ` Andrew Burgess
2021-11-21 17:56 ` Lancelot SIX [this message]
2022-01-04 14:17 ` [PATCH 09/29] gdb/testsuite: Remove duplicates from gdb.base/solib-display.exp Andrew Burgess
2021-11-21 17:56 ` [PATCH 10/29] gdb/testsuite: Remove duplicates from gdb.base/del.exp Lancelot SIX
2022-01-04 14:20 ` Andrew Burgess
2021-11-21 17:56 ` [PATCH 11/29] gdb/testsuite: Remove duplicates from gdb.base/dfp-test.exp Lancelot SIX
2022-01-04 14:26 ` Andrew Burgess
2022-01-05 22:03 ` Lancelot SIX
2022-01-06 9:34 ` Andrew Burgess
2021-11-21 17:56 ` [PATCH 12/29] gdb/testsuite: Remove duplicates from gdb.base/ptype.exp Lancelot SIX
2022-01-04 15:13 ` Andrew Burgess
2021-11-21 17:56 ` [PATCH 13/29] gdb/testsuite: Remove duplicates from gdb.base/dfp-exprs.exp Lancelot SIX
2021-12-10 23:03 ` Pedro Alves
2021-12-15 0:01 ` Lancelot SIX
2021-12-15 11:54 ` Pedro Alves
2021-11-21 17:56 ` [PATCH 14/29] gdb/testsuite: Remove duplicates from gdb.base/subst.exp Lancelot SIX
2021-11-21 17:56 ` [PATCH 15/29] gdb/testsuite: Remove duplicates from gdb.base/complete-empty.exp Lancelot SIX
2021-11-21 17:56 ` [PATCH 16/29] gdb/testsuite: Remove duplicates from gdb.base/ui-redirect.exp Lancelot SIX
2021-12-10 23:15 ` Pedro Alves
2021-12-15 0:26 ` Lancelot SIX
2021-11-21 17:56 ` [PATCH 17/29] gdb/testsuite: Remove duplicates from gdb.base/pretty-array.exp Lancelot SIX
2021-11-21 17:56 ` [PATCH 18/29] gdb/testsuite: Remove duplicates from gdb.base/readline.exp Lancelot SIX
2021-11-21 17:56 ` [PATCH 19/29] gdb/testsuite: Remove duplicates from gdb.base/exprs.exp Lancelot SIX
2021-12-10 23:15 ` Pedro Alves
2021-12-15 0:21 ` Lancelot SIX
2021-11-21 17:56 ` [PATCH 20/29] gdb/testsuite: Remove duplicates from gdb.base/set-cfd.exp Lancelot SIX
2021-11-21 17:56 ` [PATCH 21/29] gdb/testsuite: Remove duplicates from gdb.base/shlib-call.exp Lancelot SIX
2021-12-10 23:24 ` Pedro Alves
2021-12-16 22:57 ` Lancelot SIX
2021-12-17 11:58 ` Pedro Alves
2021-11-21 17:56 ` [PATCH 22/29] gdb/testsuite: Remove duplicates from gdb.base/funcargs.exp Lancelot SIX
2021-12-10 23:26 ` Pedro Alves
2021-12-16 23:08 ` Lancelot SIX
2021-12-17 12:00 ` Pedro Alves
2021-11-21 17:56 ` [PATCH 23/29] gdb/testsuite: Remove duplicates from gdb.base/define-prefix.exp Lancelot SIX
2021-11-21 17:56 ` [PATCH 24/29] gdb/testsuite: Remove duplicates from gdb.base/unload.exp Lancelot SIX
2021-11-21 17:56 ` [PATCH 25/29] gdb/testsuite: Remove duplicates from gdb.base/pointers.exp Lancelot SIX
2021-12-10 23:27 ` Pedro Alves
2021-12-16 23:14 ` Lancelot SIX
2021-12-17 12:18 ` Pedro Alves
2021-12-17 23:14 ` Lancelot SIX
2022-01-05 16:05 ` Pedro Alves
2021-11-21 17:56 ` [PATCH 26/29] gdb/testsuite: Remove duplicates from gdb.base/call-signal-resume.exp Lancelot SIX
2021-11-21 17:56 ` [PATCH 27/29] gdb/testsuite: Remove duplicates from gdb.base/nested-subp2.exp Lancelot SIX
2021-11-21 17:56 ` [PATCH 28/29] gdb/testsuite: Remove duplicates from gdb.base/watchpoints.exp Lancelot SIX
2021-12-10 23:30 ` Pedro Alves
2021-12-16 23:15 ` Lancelot SIX
2021-11-21 17:56 ` [PATCH 29/29] gdb/testsuite: Remove duplicates from gdb.base/corefile-buildid.exp Lancelot SIX
2021-12-10 23:38 ` Pedro Alves
2021-12-10 23:40 ` [PATCH 00/29] Remove DUPLICATEs from testsuite/gdb.base/*.exp Pedro Alves
2021-12-18 0:39 ` Lancelot SIX
2022-01-05 16:23 ` Pedro Alves
2022-01-07 22:36 ` Lancelot SIX
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=20211121175636.779325-10-lsix@lancelotsix.com \
--to=lsix@lancelotsix.com \
--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).