From 7579b5e08a4d1a0370a5551353e782da15dd936c Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Tue, 27 May 2025 22:46:40 +0100 Subject: [PATCH 3/4] Anchor prompt in testcase If we anchor the prompt in the testcase, so that it doesn't consume too much, we now see: (gdb) command prefix meant-to-be-matched-by-lbl-1 prefix foo prefix bar meant-to-be-matched-by-lbl-2 prefix prefix meant-to-be-matched-by-lbl-3 (gdb) FAIL: gdb.testsuite/gdb-test-multiple.exp: command PASS: gdb.testsuite/gdb-test-multiple.exp: $saw_command == 1 FAIL: gdb.testsuite/gdb-test-multiple.exp: $saw_prompt == 1 FAIL: gdb.testsuite/gdb-test-multiple.exp: $saw_prefix == 3 FAIL: gdb.testsuite/gdb-test-multiple.exp: $saw_prefix_foo == 1 FAIL: gdb.testsuite/gdb-test-multiple.exp: $saw_prefix_bar == 1 saw_prompt: 0 saw_prefix: 1 saw_prefix_foo: 0 saw_prefix_bar: 0 I.e., the built-in prompt match was not overriden, and that one consumed too much output, like in the previous patch our prompt match did. Change-Id: Id0080b6b04450d6eb5043d682efdbbd67b4139b4 --- gdb/testsuite/gdb.testsuite/gdb-test-multiple.exp | 2 +- gdb/testsuite/lib/gdb.exp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/gdb.testsuite/gdb-test-multiple.exp b/gdb/testsuite/gdb.testsuite/gdb-test-multiple.exp index d593d5dc81a..f6f254ddf8f 100644 --- a/gdb/testsuite/gdb.testsuite/gdb-test-multiple.exp +++ b/gdb/testsuite/gdb.testsuite/gdb-test-multiple.exp @@ -28,7 +28,7 @@ gdb_test_multiple "command" "" -lbl { incr saw_prefix exp_continue } - -re -wrap "" { + -re "^\r\n$gdb_prompt $" { verbose -log "" incr saw_prompt pass $gdb_test_name diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 3515d88bae5..cd920d2624c 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -1392,6 +1392,7 @@ proc gdb_test_multiple { command message args } { set result -1 } -re "\r\n$prompt_regexp" { + verbose -log "" if {![string match "" $message]} { fail "$message" } -- 2.49.0