2fd33e9448
This patch updates several exec-related tests and some of the library functions in order to get them running with extended-remote. There were three changes that were required, as follows: In gdb.base/foll-exec.exp, use 'clean_start' in place of proc 'zap_session' to reset the state of the debugger between tests. This sets 'remote exec-file' to execute the correct binary file in each subsequent test. In gdb.base/pie-execl.exp, there is an expect statement with an expression that is used to match output from both gdb and the program under debug. For the remote target, this had to be split into two expressions, using $inferior_spawn_id to match the output from the program. Because I had encountered problems with extended-remote exec events in non-stop mode in my manual testing, I added non-stop testing to the non-ldr-exc-[1234].exp tests. In order to set non-stop mode for remote targets, it is necessary to 'set non-stop on' after gdb has started, but before it connects to gdbserver. This is done using 'save_vars' to set non-stop mode in GDBFLAGS, so GDB sets non-stop mode on startup. gdb/testsuite/ChangeLog: * gdb.base/foll-exec.c: Add copyright header. Fix formatting issues. * gdb.base/foll-exec.exp (zap_session): Delete proc. (do_exec_tests): Use clean_restart in place of zap_session, and for test initialization. Fix formatting issues. Use fail in place of perror. * gdb.base/pie-execl.exp (main): Use 'inferior_spawn_id' in an expect statement to match an expression with output from the program under debug. * gdb.threads/non-ldr-exc-1.exp (do_test, main): Add non-stop tests and pass stop mode argument to clean_restart. Use save_vars to enable non-stop in GDBFLAGS. * gdb.threads/non-ldr-exc-2.exp: Likewise. * gdb.threads/non-ldr-exc-3.exp: Likewise. * gdb.threads/non-ldr-exc-4.exp: Likewise.
74 lines
2.2 KiB
Text
74 lines
2.2 KiB
Text
# Copyright 2009-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 that when a thread other than the main thread execs, we follow
|
|
# through to the new incarnation of the main thread. This differs
|
|
# from non-ldr-exc-1.exp in that we have more than two threads in the
|
|
# program when the exec happens.
|
|
|
|
# No exec event support in the remote protocol.
|
|
if { [is_remote target] } then {
|
|
continue
|
|
}
|
|
|
|
standard_testfile
|
|
set executable ${testfile}
|
|
|
|
if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
|
|
return -1
|
|
}
|
|
|
|
proc do_test { lock_sched nonstop } {
|
|
with_test_prefix "lock-sched=$lock_sched,non-stop=$nonstop" {
|
|
global executable
|
|
|
|
save_vars { GDBFLAGS } {
|
|
append GDBFLAGS " -ex \"set non-stop $nonstop\""
|
|
clean_restart ${executable}
|
|
}
|
|
|
|
if ![runto_main] {
|
|
return -1
|
|
}
|
|
|
|
gdb_breakpoint [gdb_get_line_number "break-here"]
|
|
gdb_continue_to_breakpoint "break-here" ".* break-here .*"
|
|
|
|
# Also test with sched-lock to make sure we can follow the
|
|
# non-leader thread execing even though the main thread wasn't
|
|
# resumed before the exec.
|
|
if { $lock_sched } {
|
|
gdb_test_no_output "set scheduler-locking on"
|
|
}
|
|
|
|
if { $nonstop == "on" } {
|
|
gdb_test "thread 2" "Switching.*"
|
|
}
|
|
|
|
gdb_test "continue" \
|
|
".*is executing new program.*Breakpoint 1, main.* at .*" \
|
|
"continue over exec"
|
|
}
|
|
}
|
|
|
|
foreach nonstop {"on" "off"} {
|
|
foreach schedlock {"on" "off"} {
|
|
if {$schedlock == "on" && $nonstop == "on"} {
|
|
# Schedule locking has no effect in nonstop mode.
|
|
continue
|
|
}
|
|
do_test $schedlock $nonstop
|
|
}
|
|
}
|