diff options
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/quit.exp | 20 |
2 files changed, 16 insertions, 9 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 6a984ae..de0b7bd 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-10-20 Pedro Alves <palves@redhat.com> + + * gdb.base/quit.exp: Use gdb_test_multiple and expect 'eof' before + 'wait -i'. Use gdb_assert and remote_close. + 2017-10-19 Andrew Burgess <andrew.burgess@embecosm.com> * gdb.linespec/ls-errs.exp (do_test): Update comment, use line diff --git a/gdb/testsuite/gdb.base/quit.exp b/gdb/testsuite/gdb.base/quit.exp index c81040e..b2ecc22 100644 --- a/gdb/testsuite/gdb.base/quit.exp +++ b/gdb/testsuite/gdb.base/quit.exp @@ -23,13 +23,15 @@ gdb_test "quit()" "A syntax error in expression, near .*" \ "quit with syntax error" # Test that an expression can be used to set the error code. -send_gdb "quit 22+1\n" -set result [wait -i $gdb_spawn_id] -verbose $result -if {[lindex $result 2] == 0 && [lindex $result 3] == 23} { - pass "quit with expression" -} else { - fail "quit with expression" + +set test "quit with expression" +gdb_test_multiple "quit 22+1" $test { + eof { + set result [wait -i $gdb_spawn_id] + verbose $result + gdb_assert {[lindex $result 2] == 0 && [lindex $result 3] == 23} $test + + remote_close host + clear_gdb_spawn_id + } } -close $gdb_spawn_id -clear_gdb_spawn_id |