gdb/ChangeLog:

2012-09-01  Khoo Yit Phang  <khooyp@cs.umd.edu>

	Add -nx option to "xgdb" test to prevent spurious results
	due to ~/.gdbinit.
	* testsuite/gdb.gdb/selftest.exp: (run until breakpoint at
	captured_main) Add -nx option.

diff --git a/gdb/testsuite/gdb.gdb/selftest.exp b/gdb/testsuite/gdb.gdb/selftest.exp
--- a/gdb/testsuite/gdb.gdb/selftest.exp
+++ b/gdb/testsuite/gdb.gdb/selftest.exp
@@ -303,7 +303,7 @@
     set timeout 600
 
     set description "run until breakpoint at captured_main"
-    gdb_test_multiple "run -nw" "$description" {
+    gdb_test_multiple "run -nw -nx" "$description" {
 	-re "Starting program.*Breakpoint \[0-9\]+,.*captured_main .data.* at .*main.c:.*$gdb_prompt $" {
 	    pass "$description"
 	}