45fd756caf
I see the following two timeout fails on pandaboard (arm-linux target), FAIL: gdb.base/watch-bitfields.exp: -location watch against bitfields: continue until exit (timeout) FAIL: gdb.base/watch-bitfields.exp: regular watch against bitfields: continue until exit (timeout) In this test, more than one watchpoint is used, so the following watchpoint requests fall back to software watchpoint, so that GDB will single step all the way and it is very slow. This patch is to copy the fix from [PATCH] GDB/testsuite: Correct gdb.base/watchpoint-solib.exp timeout tweak https://sourceware.org/ml/gdb-patches/2014-07/msg00716.html I find the left-over of this patch review is to factor out code into a procedure, so I do that in this patch. Re-run tests watch-bitfields.exp, watchpoint-solib.exp, sigall-reverse.exp, and until-precsave.exp on pandaboard, no regression. gdb/testsuite: 2015-04-15 Pedro Alves <palves@redhat.com> Yao Qi <yao.qi@linaro.org> * gdb.base/watch-bitfields.exp (test_watch_location): Increase timeout by factor of 4. (test_regular_watch): Likewise. * gdb.base/watchpoint-solib.exp: Use with_timeout_factor. * gdb.reverse/sigall-reverse.exp: Likewise. * gdb.reverse/until-precsave.exp: Likewise. * lib/gdb.exp (with_timeout_factor): New proc. (gdb_expect): Move some code to ... (get_largest_timeout): ... here. New procedure.
82 lines
2.5 KiB
Text
82 lines
2.5 KiB
Text
# Copyright 2007-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 running programs
|
|
#
|
|
|
|
if {[skip_shlib_tests]} {
|
|
return 0
|
|
}
|
|
|
|
set testfile "watchpoint-solib"
|
|
set libfile "watchpoint-solib-shr"
|
|
set libname "${libfile}.sl"
|
|
set libsrcfile ${libfile}.c
|
|
set srcfile $srcdir/$subdir/$testfile.c
|
|
set binfile [standard_output_file $testfile]
|
|
set shlibdir [standard_output_file {}]
|
|
set libsrc $srcdir/$subdir/$libfile.c
|
|
set lib_sl [standard_output_file $libname]
|
|
set lib_dlopen [shlib_target_file ${libname}]
|
|
set lib_syms [shlib_symbol_file ${libname}]
|
|
|
|
if [get_compiler_info] {
|
|
return -1
|
|
}
|
|
|
|
set lib_opts debug
|
|
set exec_opts [list debug shlib_load additional_flags=-DSHLIB_NAME=\"${lib_dlopen}\"]
|
|
|
|
if { [gdb_compile_shlib $libsrc $lib_sl $lib_opts] != ""
|
|
|| [gdb_compile $srcfile $binfile executable $exec_opts] != ""} {
|
|
untested "Couldn't compile $libsrc or $srcfile."
|
|
return -1
|
|
}
|
|
|
|
# Start with a fresh gdb.
|
|
|
|
gdb_exit
|
|
gdb_start
|
|
gdb_reinitialize_dir $srcdir/$subdir
|
|
gdb_load ${binfile}
|
|
gdb_load_shlibs $lib_sl
|
|
|
|
runto_main
|
|
|
|
# Disable hardware watchpoints if necessary.
|
|
if [target_info exists gdb,no_hardware_watchpoints] {
|
|
gdb_test_no_output "set can-use-hw-watchpoints 0" ""
|
|
}
|
|
|
|
# Test that if we set a watchpoint on a global variable
|
|
# in a explicitly loaded shared library, and then
|
|
# re-run the application, gdb does not crash.
|
|
gdb_test_multiple "break foo" "set pending breakpoint" {
|
|
-re ".*Make breakpoint pending.*y or \\\[n\\\]. $" {
|
|
gdb_test "y" "Breakpoint.*foo.*pending." "set pending breakpoint"
|
|
}
|
|
}
|
|
|
|
gdb_test "continue" ".*Breakpoint 2.*foo.*" "continue to foo"
|
|
gdb_test "watch g" "atchpoint 3: g" "set watchpoint on g"
|
|
gdb_test "continue" ".*New value = 1.*" "continue to watchpoint hit"
|
|
rerun_to_main
|
|
|
|
with_timeout_factor 30 {
|
|
gdb_test "continue" ".*Breakpoint 2.*foo.*" "continue to foo again"
|
|
}
|
|
|
|
gdb_test "continue" ".*New value = 1.*" "continue to watchpoint hit again"
|