From 61638e15c52b9c818c1eae213cdecbf71f5b7b32 Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Sat, 10 Dec 2011 23:05:08 +0000 Subject: [PATCH] gdb/testsuite/ PR testsuite/12649 * gdb.trace/ftrace.exp (test_fast_tracepoints): Import gdb_prompt. Protect gdb_test_multiple by final $gdb_prompt match. --- gdb/testsuite/ChangeLog | 6 ++++++ gdb/testsuite/gdb.trace/ftrace.exp | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 1a51587b498..1a02cf9fac6 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2011-12-10 Jan Kratochvil + + PR testsuite/12649 + * gdb.trace/ftrace.exp (test_fast_tracepoints): Import gdb_prompt. + Protect gdb_test_multiple by final $gdb_prompt match. + 2011-12-10 Jan Kratochvil * gdb.cp/static-method.exp (have_gcc_45682_fixed, info addr A::func()): diff --git a/gdb/testsuite/gdb.trace/ftrace.exp b/gdb/testsuite/gdb.trace/ftrace.exp index f45c6da1114..ab0e3bff022 100644 --- a/gdb/testsuite/gdb.trace/ftrace.exp +++ b/gdb/testsuite/gdb.trace/ftrace.exp @@ -76,6 +76,7 @@ proc run_trace_experiment {} { } proc test_fast_tracepoints {} { + global gdb_prompt set fourgood 0 @@ -111,10 +112,10 @@ proc test_fast_tracepoints {} { } gdb_test_multiple "ftrace four_byter" "set 4-byte fast tracepoint" { - -re "May not have a fast tracepoint at .*" { + -re "May not have a fast tracepoint at .*\r\n$gdb_prompt $" { pass "4-byte fast tracepoint could not be set" } - -re "Fast tracepoint .*" { + -re "Fast tracepoint .*\r\n$gdb_prompt $" { pass "4-byte fast tracepoint is set" set fourgood 1 } -- 2.30.2