Re: [patch] XFAIL gdb.cp/mb-inline.exp conditionaly

[Yao Qi <yao@codesourcery.com>]

[-- Attachment #1: Type: text/plain, Size: 572 bytes --]

On 06/23/2011 06:37 PM, Pedro Alves wrote:
> On Thursday 23 June 2011 10:21:21, Yao Qi wrote:
>>         gdb/testsuite/
>>         * gdb.cp/mb-inline.exp: Parse the output of `info break' to check breakpoint
>>         1.2 is disabled.  XFAIL for uclinux.
> 
> If you don't want to fix gdb for this now, then please open a PR, and
> make it a kfail instead.  Okay with that change.
> 

A PR is opened http://sourceware.org/bugzilla/show_bug.cgi?id=12924.

Patch attached is what I committed.

http://sourceware.org/ml/gdb-cvs/2011-06/msg00139.html

-- 
Yao (齐尧)

[-- Attachment #2: mb-inline-v2.patch --]
[-- Type: text/x-patch, Size: 1105 bytes --]

	gdb/testsuite/
	* 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/gdb.cp/mb-inline.exp b/gdb/testsuite/gdb.cp/mb-inline.exp
index 86cb5ba..81f7460 100644
--- 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.