[obv] testsuite: read1 fix: gdb.arch/i386-dr3-watch.exp

[Jan Kratochvil <jan.kratochvil@redhat.com>]

Hi Pedro,

with "read1" runtest
	[Bug testsuite/12649] New: reproducer for races of expect incomplete reads
	http://sourceware.org/bugzilla/show_bug.cgi?id=12649
and therefore occasionally even during normal runs it will:
	FAIL: gdb.arch/i386-dr3-watch.exp: watch i1 still fits (got interactive prompt)
	FAIL: gdb.arch/i386-dr3-watch.exp: watch i2 still fits
	FAIL: gdb.arch/i386-dr3-watch.exp: watch i3 still fits
	FAIL: gdb.arch/i386-dr3-watch.exp: watch i4 still fits
due to
	watch gap1
	Hardware watchpoint 7: gap1
	Warning:
	Could not insert hardware watchpoint 7.
	Could not insert hardware breakpoints:
	You may have requested too manyPASS: gdb.arch/i386-dr3-watch.exp: watchpoint on gap1 does not fit debug registers
	 hardware breakpoints/watchpoints.
	
	(gdb) PASS: gdb.arch/i386-dr3-watch.exp: delete all watchpoints
	delete
	Delete all breakpoints? (y or n) watch i1
	Please answer y or n.
	Delete all breakpoints? (y or n) n
	(gdb) FAIL: gdb.arch/i386-dr3-watch.exp: watch i1 still fits (got interactive prompt)

Checked in.  Tested on {x86_64,x86_64-m32}-fedora16pre-linux-gnu.


Thanks,
Jan


http://sourceware.org/ml/gdb-cvs/2011-08/msg00077.html

--- src/gdb/testsuite/ChangeLog	2011/08/14 15:58:39	1.2834
+++ src/gdb/testsuite/ChangeLog	2011/08/15 07:56:20	1.2835
@@ -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".
--- src/gdb/testsuite/gdb.arch/i386-dr3-watch.exp	2011/07/22 16:58:32	1.2
+++ src/gdb/testsuite/gdb.arch/i386-dr3-watch.exp	2011/08/15 07:56:20	1.3
@@ -64,7 +64,7 @@
 # 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 "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