* [pushed 1/2] [gdb/testsuite] Fix gdb.threads/threadapply.exp with editing off
@ 2023-03-31 15:15 Tom de Vries
2023-03-31 15:15 ` [pushed 2/2] [gdb/testsuite] Fix gdb.base/trace-commands.exp " Tom de Vries
0 siblings, 1 reply; 2+ messages in thread
From: Tom de Vries @ 2023-03-31 15:15 UTC (permalink / raw)
To: gdb-patches
With test-case gdb.threads/threadapply.exp and editing set to on, we have:
...
(gdb) define remove^M
Type commands for definition of "remove".^M
End with a line saying just "end".^M
>remove-inferiors 3^M
>end^M
(gdb)
...
but with editing set to off, we run into:
...
(gdb) define remove^M
Type commands for definition of "remove".^M
End with a line saying just "end".^M
>remove-inferiors 3^M
end^M
>(gdb) FAIL: gdb.threads/threadapply.exp: thread_set=all: try remove: \
define remove (timeout)
...
The commands are issued by this test:
...
gdb_define_cmd "remove" {
"remove-inferiors 3"
}
...
which does:
- gdb_test_multiple "define remove", followed by
- gdb_test_multiple "remove-inferiors 3\nend".
Proc gdb_test_multiple has special handling for multi-line commands, which
splits it up into subcommands, and for each subcommand issues it and then
waits for the resulting prompt (the secondary prompt ">" for all but the last
subcommand).
However, that doesn't work as expected in this case because the initial
gdb_test_multiple "define remove" fails to match all resulting output, and
consequently the secondary prompt resulting from "define remove" is counted as
if it was the one resulting from "remove-inferiors 3".
Fix this by matching the entire output of "define remove", including the
secondary prompt.
Tested on x86_64-linux.
PR testsuite/30288
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=30288
---
gdb/testsuite/lib/gdb.exp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index 8b85618abcd..bb4bd656471 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -8490,7 +8490,7 @@ proc gdb_define_cmd {command command_list} {
set test "define $command"
gdb_test_multiple "define $command" $test {
- -re "End with" {
+ -re "End with \[^\r\n\]*\r\n *>$" {
gdb_test_multiple $input $test {
-re "\r\n$gdb_prompt " {
}
base-commit: 54bca63b5c3714e1032bf32754dbadaff424221a
--
2.35.3
^ permalink raw reply [flat|nested] 2+ messages in thread
* [pushed 2/2] [gdb/testsuite] Fix gdb.base/trace-commands.exp with editing off
2023-03-31 15:15 [pushed 1/2] [gdb/testsuite] Fix gdb.threads/threadapply.exp with editing off Tom de Vries
@ 2023-03-31 15:15 ` Tom de Vries
0 siblings, 0 replies; 2+ messages in thread
From: Tom de Vries @ 2023-03-31 15:15 UTC (permalink / raw)
To: gdb-patches
With test-case gdb.base/trace-commands.exp and editing off, I run into fails
because multi-line commands are issued using gdb_test_sequence, which
doesn't handle them correctly.
Fix this by using gdb_test instead.
Tested on x86_64-linux.
PR testsuite/30288
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=30288
---
gdb/testsuite/gdb.base/trace-commands.exp | 67 ++++++++++++++---------
1 file changed, 40 insertions(+), 27 deletions(-)
diff --git a/gdb/testsuite/gdb.base/trace-commands.exp b/gdb/testsuite/gdb.base/trace-commands.exp
index c37b6d99d08..c936d228097 100644
--- a/gdb/testsuite/gdb.base/trace-commands.exp
+++ b/gdb/testsuite/gdb.base/trace-commands.exp
@@ -69,27 +69,33 @@ gdb_test "show trace-commands" \
gdb_test "echo hi\\n" {\+echo hi\\n[\r\n]+hi} "simple trace-commands test"
# Nested test
-gdb_test_sequence "if 1\nset \$i = 0\nwhile \$i < 5\nfunc \$i\nset \$i += 1\nend\nend" \
- "nested trace-commands test" {
- {[\r\n]\+if 1}
- {[\r\n]\+\+set \$i = 0}
- {[\r\n]\+\+while \$i < 5}
- {[\r\n]\+\+\+func \$i}
- {[\r\n]\+\+\+\+echo in func \$i\\n}
- {[\r\n]\+\+\+set \$i \+= 1}
- {[\r\n]\+\+\+func \$i}
- {[\r\n]\+\+\+\+echo in func \$i\\n}
- {[\r\n]\+\+\+set \$i \+= 1}
- {[\r\n]\+\+\+func \$i}
- {[\r\n]\+\+\+\+echo in func \$i\\n}
- {[\r\n]\+\+\+set \$i \+= 1}
- {[\r\n]\+\+\+func \$i}
- {[\r\n]\+\+\+\+echo in func \$i\\n}
- {[\r\n]\+\+\+set \$i \+= 1}
- {[\r\n]\+\+\+func \$i}
- {[\r\n]\+\+\+\+echo in func \$i\\n}
- {[\r\n]\+\+\+set \$i \+= 1}
+set strings {
+ {+if 1}
+ {++set $i = 0}
+ {++while $i < 5}
+ {+++func $i}
+ {++++echo in func $i\n}
+ {+++set $i += 1}
+ {+++func $i}
+ {++++echo in func $i\n}
+ {+++set $i += 1}
+ {+++func $i}
+ {++++echo in func $i\n}
+ {+++set $i += 1}
+ {+++func $i}
+ {++++echo in func $i\n}
+ {+++set $i += 1}
+ {+++func $i}
+ {++++echo in func $i\n}
+ {+++set $i += 1}
+}
+set re {}
+foreach string $strings {
+ lappend re [string_to_regexp $string]
}
+set re [join $re "\r\n(.*\r\n)?"]
+set cmd "if 1\nset \$i = 0\nwhile \$i < 5\nfunc \$i\nset \$i += 1\nend\nend"
+gdb_test $cmd $re "nested trace-commands test"
# Function with source works
gdb_test_sequence "define topfunc\nsource $tracecommandsscript\nend" \
@@ -111,13 +117,20 @@ gdb_test_sequence "topfunc" "nested trace-commands test with source" {
}
# Test nest depth resets properly on error
-gdb_test_sequence "if 1\nif 2\nload\necho should not get here\\n\nend\nend" \
- "depth resets on error part 1" {
- {[\r\n]\+if 1}
- {[\r\n]\+\+if 2}
- {[\r\n]\+\+\+load}
- {[\r\n]No executable file specified\.}
- {[\r\n]Use the "file" or "exec-file" command\.}
+set cmd "if 1\nif 2\nload\necho should not get here\\n\nend\nend"
+set strings {
+ {+if 1}
+ {++if 2}
+ {+++load}
+ {No executable file specified.}
+ {Use the "file" or "exec-file" command.}
+}
+set re {}
+foreach string $strings {
+ lappend re [string_to_regexp $string]
}
+set re [join $re "\r\n(.*\r\n)?"]
+gdb_test $cmd $re "depth resets on error part 1"
+
gdb_test "echo hi\\n" {[\r\n]\+echo hi\\n[\r\n]+hi} \
"depth resets on error part 2"
--
2.35.3
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-03-31 15:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-03-31 15:15 [pushed 1/2] [gdb/testsuite] Fix gdb.threads/threadapply.exp with editing off Tom de Vries
2023-03-31 15:15 ` [pushed 2/2] [gdb/testsuite] Fix gdb.base/trace-commands.exp " Tom de Vries
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).