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.
151 lines
4.5 KiB
Text
151 lines
4.5 KiB
Text
# Copyright 2008-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/>. */
|
|
|
|
# This file is part of the GDB testsuite. It tests 'until' and
|
|
# 'advance' in precord logfile.
|
|
|
|
# This test suitable only for process record-replay
|
|
if ![supports_process_record] {
|
|
return
|
|
}
|
|
|
|
standard_testfile until-reverse.c ur1.c
|
|
set precsave [standard_output_file until.precsave]
|
|
|
|
if { [prepare_for_testing $testfile.exp $testfile \
|
|
[list $srcfile $srcfile2]] } {
|
|
return -1
|
|
}
|
|
|
|
set bp_location1 [gdb_get_line_number "set breakpoint 1 here"]
|
|
set bp_location7 [gdb_get_line_number "set breakpoint 7 here"]
|
|
set bp_location8 [gdb_get_line_number "set breakpoint 8 here" "$srcfile2"]
|
|
set bp_location19 [gdb_get_line_number "set breakpoint 19 here"]
|
|
set bp_location20 [gdb_get_line_number "set breakpoint 20 here"]
|
|
set bp_location21 [gdb_get_line_number "set breakpoint 21 here"]
|
|
|
|
runto main
|
|
|
|
if [supports_process_record] {
|
|
# Activate process record/replay
|
|
gdb_test_no_output "record" "Turn on process record"
|
|
}
|
|
|
|
set end_of_main [gdb_get_line_number "set breakpoint 10a here" ]
|
|
gdb_test "break $end_of_main" \
|
|
"Breakpoint $decimal at .*$srcfile, line $end_of_main\." \
|
|
"BP at end of main"
|
|
|
|
# This can take awhile.
|
|
with_timeout_factor 15 {
|
|
gdb_test "continue" "Breakpoint .* set breakpoint 10a here .*" "run to end of main"
|
|
}
|
|
|
|
# So can this, against gdbserver, for example.
|
|
|
|
with_timeout_factor 3 {
|
|
gdb_test "record save $precsave" \
|
|
"Saved core file $precsave with execution log\." \
|
|
"save process recfile"
|
|
}
|
|
|
|
gdb_test "kill" "" "Kill process, prepare to debug log file" \
|
|
"Kill the program being debugged\\? \\(y or n\\) " "y"
|
|
|
|
gdb_test "record restore $precsave" \
|
|
"Restored records from core file .*" \
|
|
"reload core file"
|
|
|
|
# Verify that plain vanilla "until <location>" works.
|
|
#
|
|
gdb_test "until $bp_location1" \
|
|
"main .* at .*:$bp_location1.*" \
|
|
"until line number"
|
|
|
|
# Advance up to factorial, outer invocation
|
|
#
|
|
gdb_test "advance factorial" \
|
|
"factorial .value=6..*$srcfile:$bp_location7.*" \
|
|
"advance to factorial"
|
|
|
|
# At this point, 'until' should continue the inferior up to when all the
|
|
# inner invocations of factorial() are completed and we are back at this
|
|
# frame.
|
|
#
|
|
gdb_test "until $bp_location19" \
|
|
"factorial .value=720.*${srcfile}:$bp_location19.*" \
|
|
"until factorial, recursive function"
|
|
|
|
# Finish out to main scope
|
|
#
|
|
gdb_test "finish" \
|
|
" in main .*$srcfile:$bp_location1.*" \
|
|
"finish to main"
|
|
|
|
# Advance to a function called by main (marker2)
|
|
#
|
|
gdb_test "advance marker2" \
|
|
"marker2 .a=43.*$srcfile2:$bp_location8.*" \
|
|
"advance to marker2"
|
|
|
|
# Now issue an until with another function, not called by the current
|
|
# frame, as argument. This should not work, i.e. the program should
|
|
# stop at main, the caller, where we put the 'guard' breakpoint.
|
|
#
|
|
set test_msg "until func, not called by current frame"
|
|
gdb_test_multiple "until marker3" "$test_msg" {
|
|
-re "main .*at .*${srcfile}:$bp_location20.*$gdb_prompt $" {
|
|
pass "$test_msg"
|
|
}
|
|
-re "main .*at .*${srcfile}:$bp_location21.*$gdb_prompt $" {
|
|
pass "$test_msg"
|
|
}
|
|
}
|
|
|
|
###
|
|
###
|
|
###
|
|
|
|
# Set reverse execution direction
|
|
|
|
gdb_test_no_output "set exec-dir reverse" "set reverse execution"
|
|
|
|
#
|
|
# We should now be at main, after the return from marker2.
|
|
# "Advance" backward into marker2.
|
|
#
|
|
|
|
gdb_test "advance marker2" \
|
|
"marker2 .a=43.*$srcfile2:$bp_location8.*" \
|
|
"reverse-advance to marker2"
|
|
|
|
# Finish out to main scope (backward)
|
|
|
|
gdb_test "finish" \
|
|
" in main .*$srcfile:$bp_location20.*" \
|
|
"reverse-finish from marker2"
|
|
|
|
# Advance backward to last line of factorial (outer invocation)
|
|
|
|
gdb_test "advance $bp_location19" \
|
|
"factorial .value=720.*${srcfile}:$bp_location19.*" \
|
|
"reverse-advance to final return of factorial"
|
|
|
|
# Now do "until" across the recursive calls,
|
|
# ending up in the same frame where we are now.
|
|
|
|
gdb_test "until $bp_location7" \
|
|
"factorial .value=6..*$srcfile:$bp_location7.*" \
|
|
"reverse-until to entry of factorial"
|