Make gdb.gdb/selftest.exp use '-i $inferior_spawn_id'

gdb/testsuite/ChangeLog:
2015-07-29  Pedro Alves  <palves@redhat.com>

	* gdb.gdb/selftest.exp (test_with_self): Update comment.  Use
	send_inferior and $inferior_spawn_id.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 9f558eaa983bf3d078a5148426cfc89264266316..fc6efcba15202a4ee2a0fede5a00f319c7797fa7 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2015-07-29  Pedro Alves  <palves@redhat.com>
+
+       * gdb.gdb/selftest.exp (test_with_self): Update comment.  Use
+       send_inferior and $inferior_spawn_id.
+
 2015-07-29  Pedro Alves  <palves@redhat.com>
 
        * gdb.gdb/complaints.exp (test_initial_complaints)

diff --git a/gdb/testsuite/gdb.gdb/selftest.exp b/gdb/testsuite/gdb.gdb/selftest.exp
index 9f25a48bae2d7e4c8381d4fa8c471e4ac1aaa411..a170f730152872b3095f450f3d0d783b043cd9d7 100644 (file)
--- a/gdb/testsuite/gdb.gdb/selftest.exp
+++ b/gdb/testsuite/gdb.gdb/selftest.exp
@@ -257,6 +257,7 @@ proc test_with_self { executable } {
     global decimal
     global timeout
     global INTERNAL_GDBFLAGS
+    global inferior_spawn_id gdb_spawn_id
 
     # load yourself into the debugger
     # This can take a relatively long time, particularly for testing where
@@ -406,24 +407,27 @@ proc test_with_self { executable } {
 
     # start the "xgdb" process
     if [target_info exists gdb,noinferiorio] {
-       # Maybe testing with a local extended-remote gdbserver.  With
-       # no way to interact with inferior GDB, all we can do is let
-       # it run.
+       # With no way to interact with the inferior GDB, all we can do
+       # is let it run.
        send_gdb "continue\n"
        # Wait a bit while the inferior gdb gets to its prompt.
        sleep 1
     } else {
        set test "xgdb is at prompt"
        gdb_test_multiple "continue" $test {
+           -i "$inferior_spawn_id"
            -re "GNU gdb \[0-9\.\]*.*Copyright \\(C\\) \[0-9\]* Free Software Foundation, Inc.*License GPLv3\\+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.*This is free software: you are free to change and redistribute it.*There is NO WARRANTY, to the extent permitted by law.  Type \"show copying\".*and \"show warranty\" for details.*This GDB was configured as .*$gdb_prompt $" {
                pass $test
            }
        }
 
        # set xgdb prompt so we can tell which is which
-       gdb_test_multiple "set prompt (xgdb) " "Set xgdb_prompt" {
+       send_inferior "set prompt (xgdb) \n"
+       set msg "Set xgdb_prompt"
+       gdb_test_multiple "" $msg {
+           -i "$inferior_spawn_id"
            -re "\[(\]xgdb\[)\].*\[(\]xgdb\[)\] $" {
-               pass "Set xgdb prompt"
+               pass $msg
            }
        }
     }