aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alves <palves@redhat.com>2015-08-06 23:38:51 +0100
committerPedro Alves <palves@redhat.com>2015-08-06 23:38:51 +0100
commit782e0bf46a84f57139f25c31c2ffc93508f07ef5 (patch)
tree4e01242e209672beca4466fa22668f972845f5d4
parentaead7601eb0ddc3fa51d43747bdad0e02abda342 (diff)
downloadgdb-782e0bf46a84f57139f25c31c2ffc93508f07ef5.zip
gdb-782e0bf46a84f57139f25c31c2ffc93508f07ef5.tar.gz
gdb-782e0bf46a84f57139f25c31c2ffc93508f07ef5.tar.bz2
Fix gdb.base/valgrind-infcall.exp with the native-extended-gdbserver board
This test fails with --target_board=native-extended-gdbserver because it misses the usual "disconnect": (gdb) target remote | /usr/lib64/valgrind/../../bin/vgdb --pid=30454 Already connected to a remote target. Disconnect? (y or n) n Still connected. (gdb) FAIL: gdb.base/valgrind-infcall.exp: target remote for vgdb (got interactive prompt) gdb/testsuite/ChangeLog: 2015-08-06 Pedro Alves <palves@redhat.com> * gdb.base/valgrind-infcall.exp: Issue a "disconnect".
-rw-r--r--gdb/testsuite/ChangeLog4
-rw-r--r--gdb/testsuite/gdb.base/valgrind-infcall.exp5
2 files changed, 9 insertions, 0 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index eccdddb..e4be76e 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,9 @@
2015-08-06 Pedro Alves <palves@redhat.com>
+ * gdb.base/valgrind-infcall.exp: Issue a "disconnect".
+
+2015-08-06 Pedro Alves <palves@redhat.com>
+
PR gdb/18749
* gdb.threads/process-dies-while-handling-bp.c: New file.
* gdb.threads/process-dies-while-handling-bp.exp: New file.
diff --git a/gdb/testsuite/gdb.base/valgrind-infcall.exp b/gdb/testsuite/gdb.base/valgrind-infcall.exp
index b835c67..6e2460b 100644
--- a/gdb/testsuite/gdb.base/valgrind-infcall.exp
+++ b/gdb/testsuite/gdb.base/valgrind-infcall.exp
@@ -83,6 +83,11 @@ unset_board_info fileid
clean_restart $testfile
+# Make sure we're disconnected, in case we're testing with the
+# native-extended-gdbserver board, where gdb_start/gdb_load spawn
+# gdbserver and connect to it.
+gdb_test "disconnect" ".*"
+
gdb_test "$vgdbcmd" " in \\.?_start .*" "target remote for vgdb"
gdb_test "monitor v.set gdb_output" "valgrind output will go to gdb.*"