diff options
| -rw-r--r-- | gdb/gdbserver/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/gdbserver/server.c | 15 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.server/ext-restart.exp | 65 |
4 files changed, 87 insertions, 1 deletions
diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog index 6ae5e69..72277c1 100644 --- a/gdb/gdbserver/ChangeLog +++ b/gdb/gdbserver/ChangeLog @@ -1,3 +1,7 @@ +2015-07-24 Yao Qi <yao.qi@linaro.org> + + * server.c (process_serial_event): Set general_thread. + 2015-07-21 Yao Qi <yao.qi@linaro.org> * linux-aarch64-low.c (aarch64_arch_setup): Remove code and call diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c index 7e388dd..fd5f6dc 100644 --- a/gdb/gdbserver/server.c +++ b/gdb/gdbserver/server.c @@ -4112,7 +4112,20 @@ process_serial_event (void) /* Wait till we are at 1st instruction in prog. */ if (program_argv != NULL) - start_inferior (program_argv); + { + start_inferior (program_argv); + if (last_status.kind == TARGET_WAITKIND_STOPPED) + { + /* Stopped at the first instruction of the target + process. */ + general_thread = last_ptid; + } + else + { + /* Something went wrong. */ + general_thread = null_ptid; + } + } else { last_status.kind = TARGET_WAITKIND_EXITED; diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index f92f5b5..a7938f1 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,9 @@ 2015-07-24 Yao Qi <yao.qi@linaro.org> + * gdb.server/ext-restart.exp: New file. + +2015-07-24 Yao Qi <yao.qi@linaro.org> + * lib/gdbserver-support.exp (gdbserver_start_extended): Add argument options. * gdb.server/ext-wrapper.exp: New file. diff --git a/gdb/testsuite/gdb.server/ext-restart.exp b/gdb/testsuite/gdb.server/ext-restart.exp new file mode 100644 index 0000000..6995796 --- /dev/null +++ b/gdb/testsuite/gdb.server/ext-restart.exp @@ -0,0 +1,65 @@ +# This testcase is part of GDB, the GNU debugger. + +# Copyright 2015 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/>. + +# Test restarting programs with the R packet. + +load_lib gdbserver-support.exp + +standard_testfile server.c + +if { [skip_gdbserver_tests] } { + return 0 +} + +if { [prepare_for_testing $testfile.exp $testfile $srcfile debug] } { + return -1 +} + +# Make sure we're disconnected, in case we're testing with an +# extended-remote board, therefore already connected. +gdb_test "disconnect" ".*" + +set target_exec [gdbserver_download_current_prog] +gdbserver_start_extended + +gdb_test_no_output "set remote exec-file $target_exec" "set remote exec-file" + +gdb_breakpoint main +gdb_test "run" "Breakpoint.* main .*" "run to main" + +# Restart the process. +with_test_prefix "restart" { + # Disable vRun packet and clear remote exec-file, so that GDB will + # use R packet to restart the process. + gdb_test_no_output "set remote run-packet off" + gdb_test_no_output "set remote exec-file" + + set test "run to main" + gdb_test_multiple "run" $test { + -re {Start it from the beginning\? \(y or n\) $} { + send_gdb "y\n" + exp_continue + } + -re "Breakpoint.* main .*\r\n$gdb_prompt $" { + pass $test + } + } +} + +gdb_test "kill" "" "kill" "Kill the program being debugged.*" "y" + +gdb_test_no_output "monitor exit" |