[PATCH 12/24] Make gdb.base/a2-run.exp use $inferior_spawn_id and gdb_test_stdio

Pedro Alves
2015-04-21T18:08:50Z

This one is a little more complicated than the other patches in this
series, because of the exit status wrapper handling, requiring a
little state machine.

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

* gdb.base/a2-run.exp (saw_usage, saw_exit_wrapper)
(saw_spurious_output): Expect inferior output from
$inferior_spawn_id. Use gdb_test_stdio.
---
gdb/testsuite/gdb.base/a2-run.exp | 91 ++++++++++++++++++++++++++++++---------
1 file changed, 71 insertions(+), 20 deletions(-)

diff --git a/gdb/testsuite/gdb.base/a2-run.exp b/gdb/testsuite/gdb.base/a2-run.exp
index 3e4bfdf..dd6af25 100644
--- a/gdb/testsuite/gdb.base/a2-run.exp
+++ b/gdb/testsuite/gdb.base/a2-run.exp
@@ -33,25 +33,77 @@ if { [prepare_for_testing ${testfile}.exp $testfile $srcfile] } {
# Run with no arguments.
gdb_run_cmd

+set saw_usage 0
+set saw_exit_wrapper 0
+set saw_spurious_output 0
+
set test "run \"$testfile\" with no args"

-gdb_test_multiple "" $test {
- -re ".*usage: factorial <number>.*$inferior_exited_re with code 01.\r\n$gdb_prompt $" {
- pass $test
- pass "no spurious messages at program exit"
+set inferior_spawn_list "$inferior_spawn_id"
+set gdb_spawn_list "$gdb_spawn_id"
+
+set res [gdb_test_multiple "" $test {
+ -i inferior_spawn_list
+ -re "usage: factorial <number>" {
+ set saw_usage 1
+ exp_continue
+ }
+ -re "EXIT code 1" {
+ set saw_exit_wrapper 1
+ set inferior_spawn_list ""
+ exp_continue
+ }
+ eof {
+ if {$inferior_spawn_id != $gdb_spawn_id} {
+ # In this case we may see the server/inferior exit before
+ # GDB's program exit output. Remove from spawn list and
+ # continue waiting.
+ set inferior_spawn_list ""
+ exp_continue
+ }
+ # GDB crash.
+ fail "$test (eof)"
+ }
+
+ -i gdb_spawn_list
+
+ -re "$inferior_exited_re with code 01.\r\n$gdb_prompt $" {
}
- -re ".*usage: factorial <number>.*$inferior_exited_re with code 01.*$gdb_prompt $" {
- pass $test
- fail "no spurious messages at program exit"
+ -re "$inferior_exited_re with code 01.*$gdb_prompt $" {
+ set saw_spurious_output 1
}
- -re ".*usage: factorial <number>.* EXIT code 1.*$inferior_exited_re normally.\r\n$gdb_prompt $" {
- pass "$test (exit wrapper)"
- pass "no spurious messages at program exit"
+
+ -re "$inferior_exited_re normally.\r\n$gdb_prompt $" {
+ # This is only considered a pass if we see the exit wrapper
+ # status. Since if $inferior_spawn_id != $gdb_spawn_id the
+ # order we pick output from each spawn id isn't defined,
+ # remove gdb_spawn_id from the match lists and go back to
+ # waiting. If we had already seen the status wrapper exit,
+ # gdb_test_multiple/expect has no spawn ids left, and thus
+ # returns.
+ set gdb_spawn_list ""
+ exp_continue
}
- -re ".*usage: factorial <number>.* EXIT code 1.*$inferior_exited_re normally.*$gdb_prompt $" {
- pass "$test (exit wrapper)"
- fail "no spurious messages at program exit"
+ -re "$inferior_exited_re normally.*$gdb_prompt $" {
+ set saw_spurious_output 1
+
+ # See above.
+ set gdb_spawn_list ""
+ exp_continue
}
+}]
+
+if {$res == 0} {
+ gdb_assert ${saw_usage} $test
+
+ if {$saw_exit_wrapper} {
+ set msg "$test (exit wrapper)"
+ } else {
+ set msg $test
+ }
+
+ gdb_assert !$saw_spurious_output "no spurious messages at program exit"
+
}

# The remaining tests don't work for targets can't take arguments...
@@ -64,20 +116,20 @@ if [target_info exists noargs] then {
# Now run with some arguments
setup_xfail "arm-*-coff"
gdb_run_cmd 5
-gdb_test "" "120.*" "run \"$testfile\" with arg"
+gdb_test_stdio "" "120" "" "run \"$testfile\" with arg"

# Run again with same arguments.
gdb_run_cmd

setup_xfail "arm-*-coff"
-gdb_test "" "120.*" "run \"$testfile\" again with same args"
+gdb_test_stdio "" "120" "" "run \"$testfile\" again with same args"

# Use "set args" command to specify no arguments as default and run again.
gdb_test_no_output "set args"

gdb_run_cmd

-gdb_test "" "usage: factorial <number>.*" "run after setting args to nil"
+gdb_test_stdio "" "usage: factorial <number>" "" "run after setting args to nil"

# Use "set args" command to specify an argument and run again.
gdb_test_no_output "set args 6"
@@ -85,12 +137,11 @@ gdb_test_no_output "set args 6"
gdb_run_cmd

setup_xfail "arm-*-coff"
-gdb_test "" "720.*" "run \"$testfile\" again after setting args"
+gdb_test_stdio "" "720" "" "run \"$testfile\" again after setting args"

# GOAL: Test that shell is being used with "run". For remote debugging
# targets, there is no guarantee that a "shell" (whatever that is) is used.
if ![is_remote target] then {
- gdb_test "run `echo 8`" \
- "Starting program.*40320.*" \
- "run \"$testfile\" with shell"
+ gdb_test_stdio "run `echo 8`" \
+ "40320" "" "run \"$testfile\" with shell"
}
--
1.9.3