OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdb/ 

* infcmd.c (until_command): Use ERROR_NO_INFERIOR.  Ensure there's
	a valid selected thread, and that it is not running.
	(advance_command): Ditto.
	(finish_command): Ditto.

	gdb/testsuite/
	* gdb.base/default.exp: Adjust.
This commit is contained in:
Pedro Alves 2010-03-18 13:21:40 +00:00
parent 54801c2d1a
commit 4247603be5
4 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gdb/ChangeLog
View File

@ -1,3 +1,10 @@
2010-03-18 Pedro Alves <pedro@codesourcery.com>
* infcmd.c (until_command): Use ERROR_NO_INFERIOR. Ensure there's
a valid selected thread, and that it is not running.
(advance_command): Ditto.
(finish_command): Ditto.
2010-03-17 Stan Shebs <stan@codesourcery.com>
* ax-gdb.c (require_rvalue): Disallow non-scalars.

17
gdb/infcmd.c
View File

@ -1274,10 +1274,10 @@ until_command (char *arg, int from_tty)
{
int async_exec = 0;
if (!target_has_execution)
error (_("The program is not running."));
ERROR_NO_INFERIOR;
ensure_not_tfind_mode ();
ensure_valid_thread ();
ensure_not_running ();
/* Find out whether we must run in the background. */
if (arg != NULL)
@ -1307,10 +1307,10 @@ advance_command (char *arg, int from_tty)
{
int async_exec = 0;
if (!target_has_execution)
error (_("The program is not running."));
ERROR_NO_INFERIOR;
ensure_not_tfind_mode ();
ensure_valid_thread ();
ensure_not_running ();
if (arg == NULL)
error_no_arg (_("a location"));
@ -1565,7 +1565,10 @@ finish_command (char *arg, int from_tty)
int async_exec = 0;
ERROR_NO_INFERIOR;
ensure_not_tfind_mode ();
ensure_valid_thread ();
ensure_not_running ();
/* Find out whether we must run in the background. */
if (arg != NULL)
@ -1590,8 +1593,6 @@ finish_command (char *arg, int from_tty)
if (arg)
error (_("The \"finish\" command does not take any arguments."));
if (!target_has_execution)
error (_("The program is not running."));
frame = get_prev_frame (get_selected_frame (_("No selected frame.")));
if (frame == 0)

5
gdb/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2010-03-18 Pedro Alves <pedro@codesourcery.com>
* gdb.base/default.exp: Adjust the expected output of the finish
and until commands when the inferior is not being run.
2010-03-15 Sami Wagiaalla <swagiaal@redhat.com>
* gdb.cp/shadow.exp: Removed kfail; test has been fix.

6
gdb/testsuite/gdb.base/default.exp
View File

@ -250,7 +250,7 @@ gdb_expect {
}
#test finish
gdb_test "finish" "The program is not running." "finish"
gdb_test "finish" "The program is not being run." "finish"
#test forward-search
# The message here comes from the regexp library, not gdb, and so can
# vary on different systems.
@ -753,9 +753,9 @@ gdb_test "tbreak" "No default breakpoint address now." "tbreak"
#test tty
gdb_test "tty" "Argument required .filename to set it to\..*" "tty"
#test until "u" abbreviation
gdb_test "u" "The program is not running." "until \"u\" abbreviation"
gdb_test "u" "The program is not being run." "until \"u\" abbreviation"
#test until
gdb_test "until" "The program is not running." "until"
gdb_test "until" "The program is not being run." "until"
#test undisplay
# FIXME -- need to dump full output to detailed log
send_gdb "undisplay\n"