[pushed,1/2,gdb/testsuite] Fix gdb.threads/threadapply.exp with editing off

Message ID 20230331151553.7938-1-tdevries@suse.de
State Committed
Series [pushed,1/2,gdb/testsuite] Fix gdb.threads/threadapply.exp with editing off |

Commit Message

Tom de Vries March 31, 2023, 3:15 p.m. UTC
  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
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
>(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

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(-)

base-commit: 54bca63b5c3714e1032bf32754dbadaff424221a


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 " {