From: Tom de Vries <tdevries@suse.de>
To: gdb-patches@sourceware.org
Cc: Ulrich Weigand <Ulrich.Weigand@de.ibm.com>, Carl Love <cel@us.ibm.com>
Subject: [pushed] [gdb/testsuite] Fix gdb.opt/solib-intra-step.exp for powerpc64le
Date: Mon, 28 Nov 2022 14:23:54 +0100 [thread overview]
Message-ID: <20221128132354.2571-1-tdevries@suse.de> (raw)
On powerpc64le-linux, I run into:
...
(gdb) PASS: gdb.opt/solib-intra-step.exp: first-hit
step^M
28 { /* first-retry */^M
(gdb) FAIL: gdb.opt/solib-intra-step.exp: second-hit
...
It's a bit easier to understand what happens if we do a full stepping session:
...
Temporary breakpoint 1, main ()
at solib-intra-step-main.c:23
23 shlib_first ();
(gdb) step
shlib_first () at solib-intra-step-lib.c:29
29 shlib_second (0); /* first-hit */
(gdb) step
28 { /* first-retry */
(gdb) step
29 shlib_second (0); /* first-hit */
(gdb) step
shlib_second (dummy=0)
at solib-intra-step-lib.c:23
23 abort (); /* second-hit */
...
and compare that to the line info:
...
CU: solib-intra-step-lib.c:
File name Line number Starting address View Stmt
solib-intra-step-lib.c 22 0x710 x
solib-intra-step-lib.c 23 0x724 x
solib-intra-step-lib.c 28 0x740 x
solib-intra-step-lib.c 29 0x74c x
solib-intra-step-lib.c 28 0x750 x
solib-intra-step-lib.c 29 0x758 x
solib-intra-step-lib.c 30 0x760 x
solib-intra-step-lib.c - 0x77c
...
So we step from line 29 to line 28, and back to line 29, which is behaviour
that matches the line table. The peculiar order is due to using optimization.
The problem is that the test-case doesn't expect this order.
Fix this by allowing this order in the test-case.
Tested on powerpc64le-linux.
PR testsuite/29792
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=29792
---
gdb/testsuite/gdb.opt/solib-intra-step.exp | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/gdb/testsuite/gdb.opt/solib-intra-step.exp b/gdb/testsuite/gdb.opt/solib-intra-step.exp
index 0acda6594c5..e803a7db14d 100644
--- a/gdb/testsuite/gdb.opt/solib-intra-step.exp
+++ b/gdb/testsuite/gdb.opt/solib-intra-step.exp
@@ -58,16 +58,35 @@ gdb_test_multiple "step" $test {
}
}
+set in_second 0
set test "second-hit"
gdb_test_multiple "step" $test {
+ -re -wrap " first-retry .*" {
+ if { $in_second } {
+ fail $gdb_test_name
+ } else {
+ send_gdb "step\n"
+ exp_continue
+ }
+ }
+ -re -wrap " first-hit .*" {
+ if { $in_second } {
+ fail $gdb_test_name
+ } else {
+ send_gdb "step\n"
+ exp_continue
+ }
+ }
-re -wrap " second-hit .*" {
pass $gdb_test_name
}
-re -wrap " second-retry .*" {
+ set in_second 1
send_gdb "step\n"
exp_continue
}
-re -wrap "get_pc_thunk.*" {
+ set in_second 1
send_gdb "step\n"
exp_continue
}
base-commit: ddff2a2dea5261789e1f281f3ee1b33dd5fd8892
--
2.35.3
next reply other threads:[~2022-11-28 13:23 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-28 13:23 Tom de Vries [this message]
2022-11-28 17:13 ` Carl Love
2022-11-28 17:17 ` 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=20221128132354.2571-1-tdevries@suse.de \
--to=tdevries@suse.de \
--cc=Ulrich.Weigand@de.ibm.com \
--cc=cel@us.ibm.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).