[PATCH 19/24] Make gdb.gdb/selftest.exp use '-i $inferior_spawn_id'

Pedro Alves
2015-04-21T18:09:06Z

* gdb.gdb/selftest.exp (test_with_self): Update comment. Use
send_inferior and $inferior_spawn_id.
---
gdb/testsuite/gdb.gdb/selftest.exp | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/gdb/testsuite/gdb.gdb/selftest.exp b/gdb/testsuite/gdb.gdb/selftest.exp
index 9f25a48..a170f73 100644
--- 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
}
}
}
--
1.9.3