From f29f4b6ba198674096fddf2aa38fa8d028d387b2 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Thu, 9 Nov 2017 22:44:08 +0000 Subject: [PATCH] Fix racy output matching in gdb.asm/asm-source.exp Testing with: $ make check-read1 TESTS="gdb.asm/asm-source.exp" Exposes a testcase bug that can result in racy fails: (gdb) PASS: gdb.asm/asm-source.exp: next over foo3 return Make selected stack frame return now? (y or n) y n #0 main () at /home/pedro/gdb/mygit/src/gdb/testsuite/gdb.asm/asmsrc1.s:53 53 gdbasm_exit0 (gdb) FAIL: gdb.asm/asm-source.exp: return from foo2 (got interactive prompt) n The problem is that the "return now\?.*" regex can match partial output like this: "Make selected stack frame return no" and then we send the 'y' too early, and then the next time around we hit gdb_test_multiple's internal "got interactive prompt" regex. Also, note we match "return no" instead of "return now" because the regex is missing one quote level. gdb/testsuite/ChangeLog: 2017-11-09 Pedro Alves * gdb.asm/asm-source.exp ("kill" test): Match the whole query output. Fix '?' match. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.asm/asm-source.exp | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 15c0caf8532..8566dc14aa3 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-11-09 Pedro Alves + + * gdb.asm/asm-source.exp ("kill" test): Match the whole query + output. Fix '?' match. + 2017-11-08 Joel Brobecker * gdb.ada/scoped_watch: New testcase. diff --git a/gdb/testsuite/gdb.asm/asm-source.exp b/gdb/testsuite/gdb.asm/asm-source.exp index 138609a3c80..47717a26a87 100644 --- a/gdb/testsuite/gdb.asm/asm-source.exp +++ b/gdb/testsuite/gdb.asm/asm-source.exp @@ -435,7 +435,7 @@ gdb_test "next" "$line_foo2_leave\[ \t\]+gdbasm_leave" "next over foo3" # Like "finish", "return" command also can return to the caller # line again or the statement after, depending on the architecture. gdb_test_multiple "return" "return from foo2" { - -re "Make (foo2|selected stack frame) return now\?.*" { + -re "Make (foo2|selected stack frame) return now\\? .y or n. " { send_gdb "y\n" exp_continue } -- 2.30.2