From: Lancelot SIX via Gdb-patches <gdb-patches@sourceware.org>
To: gdb-patches@sourceware.org
Cc: Lancelot SIX <lsix@lancelotsix.com>
Subject: [PATCH 04/12] gdb/testsuite: Remove duplicates from gdb.mi/mi-catch-load.exp
Date: Fri, 26 Nov 2021 23:00:30 +0000 [thread overview]
Message-ID: <20211126230038.103225-5-lsix@lancelotsix.com> (raw)
In-Reply-To: <20211126230038.103225-1-lsix@lancelotsix.com>
When I run the testsuite, I have:
Running .../gdb/testsuite/gdb.mi/mi-catch-load.exp ...
DUPLICATE: gdb.mi/mi-catch-load.exp: breakpoint at main
DUPLICATE: gdb.mi/mi-catch-load.exp: mi runto main
Fix by grouping the various phases in with_test_prefix blocks.
Tested on x86_64-linux
---
gdb/testsuite/gdb.mi/mi-catch-load.exp | 77 ++++++++++++++------------
1 file changed, 41 insertions(+), 36 deletions(-)
diff --git a/gdb/testsuite/gdb.mi/mi-catch-load.exp b/gdb/testsuite/gdb.mi/mi-catch-load.exp
index cbd3967f47a..431db68c5c6 100644
--- a/gdb/testsuite/gdb.mi/mi-catch-load.exp
+++ b/gdb/testsuite/gdb.mi/mi-catch-load.exp
@@ -40,48 +40,53 @@ if { [gdb_compile_shlib "${srcdir}/${subdir}/${srcfile2}" ${binfile2} {debug}] !
return -1
}
-mi_clean_restart $binfile
-mi_runto_main
-
# test -catch-load
-mi_gdb_test "111-gdb-set auto-solib-add on" "111\\^done" "catch-load: auto-solib-add on"
-mi_gdb_test "222-catch-load -t mi-catch-load-so.so*" \
- "222\\^done,bkpt=\{number=\"2\",type=\"catchpoint\",disp=\"del\",enabled=\"y\",what=\"load of library matching mi-catch-load-so\.so\\*\",catch-type=\"load\",thread-groups=\\\[\"i1\"\\\],times=\"0\"\}" \
- "catch-load: catch load"
-mi_send_resuming_command "exec-continue" "catch-load: continue"
+with_test_prefix "test -catch-load" {
+ mi_clean_restart $binfile
+ mi_runto_main
-gdb_expect {
- -re "\\*stopped.*reason=\"solib-event\".*added=.*\r\n.*\r\n$mi_gdb_prompt$" {
- pass "catch-load: solib-event stop"
- }
- -re ".*$mi_gdb_prompt$" {
- setup_kfail mi/15945 *-*-*mingw*
- fail "catch-load: solib-event stop"
- }
- timeout {
- fail "(timeout) catch-load: solib-event stop"
+ mi_gdb_test "111-gdb-set auto-solib-add on" "111\\^done" \
+ "catch-load: auto-solib-add on"
+ mi_gdb_test "222-catch-load -t mi-catch-load-so.so*" \
+ "222\\^done,bkpt=\{number=\"2\",type=\"catchpoint\",disp=\"del\",enabled=\"y\",what=\"load of library matching mi-catch-load-so\.so\\*\",catch-type=\"load\",thread-groups=\\\[\"i1\"\\\],times=\"0\"\}" \
+ "catch-load: catch load"
+ mi_send_resuming_command "exec-continue" "catch-load: continue"
+
+ gdb_expect {
+ -re "\\*stopped.*reason=\"solib-event\".*added=.*\r\n.*\r\n$mi_gdb_prompt$" {
+ pass "catch-load: solib-event stop"
+ }
+ -re ".*$mi_gdb_prompt$" {
+ setup_kfail mi/15945 *-*-*mingw*
+ fail "catch-load: solib-event stop"
+ }
+ timeout {
+ fail "(timeout) catch-load: solib-event stop"
+ }
}
}
-mi_clean_restart $binfile
-mi_runto_main
-
# test -catch-unload
-mi_gdb_test "111-gdb-set auto-solib-add on" "111\\^done" "catch-unload: auto-solib-add on"
-mi_gdb_test "222-catch-unload -t mi-catch-load-so.so*" \
- "222\\^done,bkpt=\{number=\"2\",type=\"catchpoint\",disp=\"del\",enabled=\"y\",what=\"unload of library matching mi-catch-load-so\.so\\*\",catch-type=\"unload\",thread-groups=\\\[\"i1\"\\\],times=\"0\"\}" \
- "catch-unload: catch unload"
-mi_send_resuming_command "exec-continue" "catch-unload: continue"
+with_test_prefix "test -catch-unload" {
+ mi_clean_restart $binfile
+ mi_runto_main
-gdb_expect {
- -re "\\*stopped.*reason=\"solib-event\".*removed=.*\r\n.*\r\n$mi_gdb_prompt$" {
- pass "catch-unload: solib-event stop"
- }
- -re ".*$mi_gdb_prompt$" {
- setup_kfail mi/15945 *-*-*mingw*
- fail "catch-unload: solib-event stop"
- }
- timeout {
- fail "(timeout) catch-unload: solib-event stop"
+ mi_gdb_test "111-gdb-set auto-solib-add on" "111\\^done" "catch-unload: auto-solib-add on"
+ mi_gdb_test "222-catch-unload -t mi-catch-load-so.so*" \
+ "222\\^done,bkpt=\{number=\"2\",type=\"catchpoint\",disp=\"del\",enabled=\"y\",what=\"unload of library matching mi-catch-load-so\.so\\*\",catch-type=\"unload\",thread-groups=\\\[\"i1\"\\\],times=\"0\"\}" \
+ "catch-unload: catch unload"
+ mi_send_resuming_command "exec-continue" "catch-unload: continue"
+
+ gdb_expect {
+ -re "\\*stopped.*reason=\"solib-event\".*removed=.*\r\n.*\r\n$mi_gdb_prompt$" {
+ pass "catch-unload: solib-event stop"
+ }
+ -re ".*$mi_gdb_prompt$" {
+ setup_kfail mi/15945 *-*-*mingw*
+ fail "catch-unload: solib-event stop"
+ }
+ timeout {
+ fail "(timeout) catch-unload: solib-event stop"
+ }
}
}
--
2.33.1
next prev parent reply other threads:[~2021-11-26 23:03 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-26 23:00 [PATCH 00/12] Remove DUPLICATEs warnings Lancelot SIX via Gdb-patches
2021-11-26 23:00 ` [PATCH 01/12] gdb/testsuite: Remove duplicates from gdb.mi/mi-syn-frame.exp Lancelot SIX via Gdb-patches
2021-11-26 23:00 ` [PATCH 02/12] gdb/testsuite: Remove duplicates from gdb.mi/mi-nsthrexec.exp Lancelot SIX via Gdb-patches
2021-11-26 23:00 ` [PATCH 03/12] gdb/testsuite: Remove duplicates from gdb.mi/mi-watch.exp Lancelot SIX via Gdb-patches
2021-11-26 23:00 ` Lancelot SIX via Gdb-patches [this message]
2021-12-10 21:55 ` [PATCH 04/12] gdb/testsuite: Remove duplicates from gdb.mi/mi-catch-load.exp Pedro Alves
2021-12-16 23:27 ` Lancelot SIX via Gdb-patches
2021-12-17 12:21 ` Pedro Alves
2021-11-26 23:00 ` [PATCH 05/12] gdb/testsuite: Remove duplicates from gdb.mi/mi-var-child.exp Lancelot SIX via Gdb-patches
2021-12-10 21:55 ` Pedro Alves
2021-12-16 23:40 ` Lancelot SIX via Gdb-patches
2021-12-17 13:00 ` [PATCH] gdb/testsuite: Remove some duplication " Pedro Alves
2021-12-17 23:24 ` Lancelot SIX via Gdb-patches
2022-01-06 16:44 ` Pedro Alves
2021-11-26 23:00 ` [PATCH 06/12] gdb/testsuite: Remove duplicates from gdb.mi/mi2-var-child.exp Lancelot SIX via Gdb-patches
2021-11-26 23:00 ` [PATCH 07/12] gdb/testsuite: Remove duplicates from gdb.mi/mi-nonstop.exp Lancelot SIX via Gdb-patches
2021-11-26 23:00 ` [PATCH 08/12] gdb/testsuite: Remove duplicates from gdb.mi/mi-nonstop-exit.exp Lancelot SIX via Gdb-patches
2021-12-10 21:56 ` Pedro Alves
2021-12-16 23:48 ` Lancelot SIX via Gdb-patches
2021-12-17 13:52 ` Pedro Alves
2021-11-26 23:00 ` [PATCH 09/12] gdb/testsuite: Remove duplicates from gdb.mi/mi-var-rtti.exp Lancelot SIX via Gdb-patches
2021-11-26 23:00 ` [PATCH 10/12] gdb/testsuite: Remove duplicates from gdb.mi/mi-language.exp Lancelot SIX via Gdb-patches
2021-12-10 21:56 ` Pedro Alves
2021-12-16 23:59 ` Lancelot SIX via Gdb-patches
2021-12-17 13:53 ` Pedro Alves
2021-11-26 23:00 ` [PATCH 11/12] gdb/testsuite: Remove duplicates from gdb.mi/mi2-amd64-entry-value.exp Lancelot SIX via Gdb-patches
2021-12-10 21:56 ` Pedro Alves
2021-12-17 22:57 ` Lancelot SIX via Gdb-patches
2022-01-06 16:49 ` Pedro Alves
2021-11-26 23:00 ` [PATCH 12/12] gdb/testsuite: Remove duplicates from gdb.threads/staticthreads.ex Lancelot SIX via Gdb-patches
2021-12-09 18:15 ` [PATCH 00/12] Remove DUPLICATEs warnings Tom Tromey
2021-12-10 22:01 ` Pedro Alves
2022-01-07 22:43 ` Lancelot SIX via Gdb-patches
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=20211126230038.103225-5-lsix@lancelotsix.com \
--to=gdb-patches@sourceware.org \
--cc=lsix@lancelotsix.com \
/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