From c12440c923e84ac14c210cccfa57306fc3e68e91 Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Thu, 21 Mar 2013 19:18:25 +0000 Subject: [PATCH] Fix gdb.trace/trace-buffer-size.exp race. Just the usual missing $gdb_prompt match: (gdb) tstatus No trace has been run on the target. Collected 0 trace frames. Trace buffer has 5242880 bytes of 5242880 bytes free (0% full). Trace will stop if GDB disconnects. Not looking at any trace frame. PASS: gdb.trace/trace-buffer-size.exp: get default buffer size (gdb) set trace-buffer-size 4 (gdb) FAIL: gdb.trace/trace-buffer-size.exp: set trace buffer size 1 This fixes it. gdb/testsuite/ 2013-03-21 Pedro Alves * gdb.trace/trace-buffer-size.exp (get default buffer size): Expect $gdb_prompt in gdb_test_multiple. --- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.trace/trace-buffer-size.exp | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 690126c66d3..5e47767e4d5 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2013-03-21 Pedro Alves + + * gdb.trace/trace-buffer-size.exp (get default buffer size): + Expect $gdb_prompt in gdb_test_multiple. + 2013-03-21 Doug Evans * gdb.base/maint.exp: Update tests for per-command stats. diff --git a/gdb/testsuite/gdb.trace/trace-buffer-size.exp b/gdb/testsuite/gdb.trace/trace-buffer-size.exp index e85fbc62adb..e8c6a95da64 100644 --- a/gdb/testsuite/gdb.trace/trace-buffer-size.exp +++ b/gdb/testsuite/gdb.trace/trace-buffer-size.exp @@ -39,7 +39,7 @@ set test "get default buffer size" # Save default trace buffer size in 'default_size'. gdb_test_multiple "tstatus" $test { - -re ".*Trace buffer has ($decimal) bytes of ($decimal) bytes free.*" { + -re ".*Trace buffer has ($decimal) bytes of ($decimal) bytes free.*$gdb_prompt $" { set default_size $expect_out(2,string) pass $test } -- 2.30.2