From c1049fca4e67b64de8b97216b8c61e3292da3dc2 Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Mon, 15 Aug 2011 07:56:20 +0000 Subject: [PATCH] gdb/testsuite/ * gdb.arch/i386-dr3-watch.exp (watchpoint on gap1 does not fit debug registers) (delete all watchpoints): Fix racy expect strings. --- gdb/testsuite/ChangeLog | 6 ++++++ gdb/testsuite/gdb.arch/i386-dr3-watch.exp | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 5902d89..6fed0f6 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2011-08-15 Jan Kratochvil + + * gdb.arch/i386-dr3-watch.exp + (watchpoint on gap1 does not fit debug registers) + (delete all watchpoints): Fix racy expect strings. + 2011-08-14 Yao Qi * gdb.base/maint.exp: set data_section to ".neardata". diff --git a/gdb/testsuite/gdb.arch/i386-dr3-watch.exp b/gdb/testsuite/gdb.arch/i386-dr3-watch.exp index 35d7587..1c9cef1 100644 --- a/gdb/testsuite/gdb.arch/i386-dr3-watch.exp +++ b/gdb/testsuite/gdb.arch/i386-dr3-watch.exp @@ -64,7 +64,7 @@ gdb_test "watch i1" \ # 4 if all were available). set test "watchpoint on gap1 does not fit debug registers" gdb_test_multiple "watch gap1" "$test" { - -re "Hardware watchpoint .*: gap1.*Warning:.*Could not insert hardware watchpoint.*You may have requested too many.*" { + -re "Hardware watchpoint .*: gap1.*Warning:.*Could not insert hardware watchpoint.*You may have requested too many.*\r\n$gdb_prompt $" { pass $test } -re "Hardware watchpoint .*: gap1\r\n$gdb_prompt $" { @@ -81,7 +81,7 @@ gdb_test_multiple "watch gap1" "$test" { gdb_test "delete" \ "" \ "delete all watchpoints" \ - "Delete all breakpoints.*$" \ + {Delete all breakpoints\? \(y or n\) $} \ "y" # If debug registers were left occupied by mistake, we'll fail to set -- 2.7.4