diff options
| author | Tom Tromey <tom@tromey.com> | 2016-09-14 11:48:31 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2016-09-21 11:39:37 -0600 |
| commit | 36cf1806a87fdd208c704d0768af232ce35aae9f (patch) | |
| tree | 58fa483828e183ae1effb31bf393e57d34d52ee1 /gdb/testsuite | |
| parent | 74172ecf37e5877085c5d01f335db94e8091ba97 (diff) | |
| download | gdb-36cf1806a87fdd208c704d0768af232ce35aae9f.zip gdb-36cf1806a87fdd208c704d0768af232ce35aae9f.tar.gz gdb-36cf1806a87fdd208c704d0768af232ce35aae9f.tar.bz2 | |
PR gdb/20604 - fix "quit" when an invalid expression is used
This fixes PR gdb/20604. The bug here is that passing an invalid
expression to "quit" -- e.g., "quit()" -- causes gdb to enter a
non-functioning state.
The immediate problem is that quit_force resets the terminal before
evaluating the expression. However, it seemed to me that it doesn't
really make sense to pass the quit_force argument to kill_or_detach
(which passes it to to_detach), first because conflating the exit
status for "quit" and the signal to pass when detaching doesn't make
sense, and second because to_detach implementations generally only
accept a constant here, while "quit" accepts an expression. So, I
removed that.
As an aside, I think the "detach SIGNO" functionality is not
documented.
Built and regtested on x86-64 Fedora 24.
2016-09-21 Tom Tromey <tom@tromey.com>
PR gdb/20604:
* top.h (quit_force): Update.
* top.c (quit_force): Changed type of first argument. Don't
evaluate expression. Pass NULL to kill_or_detach.
* cli/cli-cmds.c (quit_command): Evaluate "args".
2016-09-21 Tom Tromey <tom@tromey.com>
PR gdb/20604:
* gdb.base/quit.exp: New file.
Diffstat (limited to 'gdb/testsuite')
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/quit.exp | 35 |
2 files changed, 40 insertions, 0 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 3da0314..1b8bc1a 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2016-09-21 Tom Tromey <tom@tromey.com> + + PR gdb/20604: + * gdb.base/quit.exp: New file. + 2016-09-21 Simon Marchi <simon.marchi@ericsson.com> * .gitignore: New file. diff --git a/gdb/testsuite/gdb.base/quit.exp b/gdb/testsuite/gdb.base/quit.exp new file mode 100644 index 0000000..1c9db64 --- /dev/null +++ b/gdb/testsuite/gdb.base/quit.exp @@ -0,0 +1,35 @@ +# Copyright (C) 2016 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +# Check the "quit" command. + +clean_restart + +# Test that a syntax error causes quit to abort. +# Regression test for PR gdb/20604. +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" +} +close $gdb_spawn_id +clear_gdb_spawn_id |