2011-06-23 Yao Qi <yao@codesourcery.com>

	* gdb.cp/mb-inline.exp: Parse the output of `info break' to check breakpoint
	1.2 is disabled.  KFAIL for uclinux.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index d60370f..aa9c4f5 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-23  Yao Qi  <yao@codesourcery.com>
+
+       * gdb.cp/mb-inline.exp: Parse the output of `info break' to check breakpoint
+       1.2 is disabled.  KFAIL for uclinux.
+
 2011-06-23  Marek Polacek  <mpolacek@redhat.com>
 
        * gdb.mi/mi2-var-display.exp: Replace gdb_test_multiple with

diff --git a/gdb/testsuite/gdb.cp/mb-inline.exp b/gdb/testsuite/gdb.cp/mb-inline.exp
index c8f90d0..d670b56 100644 (file)
--- a/gdb/testsuite/gdb.cp/mb-inline.exp
+++ b/gdb/testsuite/gdb.cp/mb-inline.exp
@@ -101,7 +101,19 @@ gdb_expect {
     }
 }
 
-gdb_continue_to_end "disabled breakpoint 1.2"
+gdb_test_multiple "info break" "disabled breakpoint 1.2" {
+    -re "1\.2.* n .* at .*$hdrfile:$bp_location.*$gdb_prompt $" {
+       pass "disabled breakpoint 1.2"
+    }
+    -re "1\.2.* y .* at .*$hdrfile:$bp_location.*$gdb_prompt $" {
+       # When inferior is restarted, breakpoint locations will be updated.
+       # On uclinux, it is not guaranteed that new inferior is located the
+       # same address as previous one, so status/state of breakpoint location
+       # will loose.  The heuristic of GDB should be improved.
+       setup_kfail gdb/12924 "*-*-uclinux*"
+       fail "disabled breakpoint 1.2"
+    }    
+}
 
 # Make sure we can set a breakpoint on a source statement that spans
 # multiple lines.