gdb/testsuite/

	* gdb.arch/i386-dr3-watch.exp
	(watchpoint on gap1 does not fit debug registers)
	(delete all watchpoints): Fix racy expect strings.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 5902d896199eed0890ba686664034b36213048d2..6fed0f6b155c10589daa85729842e8a69f708786 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2011-08-15  Jan Kratochvil  <jan.kratochvil@redhat.com>
+
+       * 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  <yao@codesourcery.com>
 
        * 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 35d758706d3710d62bbb406ce5b1c7e01b38d980..1c9cef1ea4ee75841a8ad55163899904f058507b 100644 (file)
--- 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