From 5888842d28d8bff0732a5de1ab008944a7ad5123 Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Tue, 7 Aug 2012 18:04:12 +0000 Subject: [PATCH] gdb/testsuite/ * gdb.base/valgrind-infcall.exp (continue #$continue_count): Use global variable loop, not a 'break'. Add loop count limit to 100. Add new fail case for terminated vgdb. --- gdb/testsuite/ChangeLog | 6 ++++++ gdb/testsuite/gdb.base/valgrind-infcall.exp | 10 ++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 0b01846..7936bf5 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,4 +1,10 @@ 2012-08-07 Jan Kratochvil + + * gdb.base/valgrind-infcall.exp (continue #$continue_count): Use + global variable loop, not a 'break'. Add loop count limit to 100. + Add new fail case for terminated vgdb. + +2012-08-07 Jan Kratochvil Jean-Marc Saffroy PR 11804 diff --git a/gdb/testsuite/gdb.base/valgrind-infcall.exp b/gdb/testsuite/gdb.base/valgrind-infcall.exp index 3224e9c..84d6819 100644 --- a/gdb/testsuite/gdb.base/valgrind-infcall.exp +++ b/gdb/testsuite/gdb.base/valgrind-infcall.exp @@ -90,17 +90,23 @@ gdb_test "$vgdbcmd" " in \\.?_start .*" "target remote for vgdb" gdb_test "monitor v.set gdb_output" "valgrind output will go to gdb.*" set continue_count 1 -while 1 { +set loop 1 +while {$loop && $continue_count < 100} { set test "continue #$continue_count" gdb_test_multiple "continue" "" { -re "Invalid free\\(\\).*: main .*\r\n$gdb_prompt $" { pass $test - break + # In Ubuntu 10.04.4 environments 'break' does not work here. + set loop 0 } -re "Remote connection closed.*\r\n$gdb_prompt $" { fail "$test (remote connection closed)" return -1 } + -re "The program is not being run\\.\r\n$gdb_prompt $" { + fail "$test (valgrind vgdb has terminated)" + return -1 + } -re "\r\n$gdb_prompt $" { pass "$test (false warning)" } -- 2.7.4