-# Copyright 2004-2012 Free Software Foundation, Inc.
+# Copyright 2004-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
}
-set testfile sigstep
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
- untested "Couldn't compile ${srcfile}.c"
+standard_testfile
+
+if {[build_executable $testfile.exp $testfile $srcfile debug]} {
+ untested $testfile.exp
return -1
}
-# get things started
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
+set clear_done [gdb_get_line_number {done = 0}]
+set infinite_loop [gdb_get_line_number {while (!done)}]
+set other_handler_location [gdb_get_line_number "other handler location"]
+
+# Restart GDB, set a display showing $PC, and run to main.
+
+proc restart {} {
+ global binfile
+
+ clean_restart $binfile
-gdb_test "display/i \$pc"
+ gdb_test "display/i \$pc"
-# Advance to main
-if { ![runto_main] } then {
- gdb_suppress_tests;
+ runto_main
}
# Pass all the alarms straight through (but verbosely)
# gdb_test "handle SIGPROF print pass nostop"
# Run to the signal handler, validate the backtrace.
-gdb_test "break handler"
-gdb_test "continue" ".* handler .*" "continue to stepi handler"
-gdb_test_sequence "bt" "backtrace for nexti" {
- "\[\r\n\]+.0 \[^\r\n\]* handler "
- "\[\r\n\]+.1 .signal handler called."
- "\[\r\n\]+.2 \[^\r\n\]* main "
+
+proc validate_backtrace {} {
+ with_test_prefix "validate backtrace" {
+ restart
+
+ gdb_test "break handler"
+ gdb_test "continue" ".* handler .*" "continue to stepi handler"
+ gdb_test_sequence "bt" "backtrace for nexti" {
+ "\[\r\n\]+.0 \[^\r\n\]* handler "
+ "\[\r\n\]+.1 .signal handler called."
+ "\[\r\n\]+.2 \[^\r\n\]* main "
+ }
+ }
}
-proc advance { i } {
+validate_backtrace
+
+# Goes to handler using ENTER_CMD, runs IN_HANDLER while in the signal
+# hander, and then steps out of the signal handler using EXIT_CMD.
+
+proc advance { enter_cmd in_handler_prefix in_handler exit_cmd } {
global gdb_prompt inferior_exited_re
- set prefix "$i from handler"
+ global clear_done other_handler_location
- # Get us back into the handler
- gdb_test "continue" ".* handler .*" "$prefix; continue to handler"
+ set prefix "$enter_cmd to handler, $in_handler_prefix in handler, $exit_cmd from handler"
- set test "$prefix; leave handler"
- gdb_test_multiple "$i" "${test}" {
- -re "Could not insert single-step breakpoint.*$gdb_prompt $" {
- setup_kfail gdb/1736 "sparc*-*-openbsd*"
- fail "$test (could not insert single-step breakpoint)"
- }
- -re "done = 1;.*${gdb_prompt} $" {
- send_gdb "$i\n"
- exp_continue -continue_timer
- }
- -re "\} .. handler .*${gdb_prompt} $" {
- send_gdb "$i\n"
- exp_continue -continue_timer
+ with_test_prefix $prefix {
+ restart
+
+ # Get us into the handler
+ if { $enter_cmd == "continue" } {
+ gdb_test "break handler"
+ } else {
+ gdb_test "handle SIGALRM print pass stop"
+ gdb_test "handle SIGVTALRM print pass stop"
+ gdb_test "continue" "Program received signal.*" "continue to signal"
}
- -re "$inferior_exited_re normally.*${gdb_prompt} $" {
- setup_kfail gdb/1639 powerpc-*-*bsd*
- fail "$test (program exited)"
+ gdb_test "$enter_cmd" ".*handler .*" "$enter_cmd to handler"
+
+ delete_breakpoints
+
+ uplevel 1 $in_handler
+
+ if { $exit_cmd == "continue" } {
+ gdb_test "break $clear_done" ".*" "break clear done"
}
- -re "(while ..done|done = 0).*${gdb_prompt} $" {
- # After stepping out of a function /r signal-handler, GDB will
- # advance the inferior until it is at the first instruction of
- # a code-line. While typically things return to the middle of
- # the "while..." (and hence GDB advances the inferior to the
- # "return..." line) it is also possible for the return to land
- # on the first instruction of "while...". Accept both cases.
- pass "$test"
+
+ set test "leave handler"
+ gdb_test_multiple "$exit_cmd" "${test}" {
+ -re "Could not insert single-step breakpoint.*$gdb_prompt $" {
+ setup_kfail gdb/8841 "sparc*-*-openbsd*"
+ fail "$test (could not insert single-step breakpoint)"
+ }
+ -re "done = 1;.*${gdb_prompt} $" {
+ send_gdb "$exit_cmd\n"
+ exp_continue -continue_timer
+ }
+ -re "\} .. handler .*${gdb_prompt} $" {
+ send_gdb "$exit_cmd\n"
+ exp_continue -continue_timer
+ }
+ -re "$inferior_exited_re normally.*${gdb_prompt} $" {
+ setup_kfail gdb/8744 powerpc-*-*bsd*
+ fail "$test (program exited)"
+ }
+ -re "(while ..done|done = 0).*${gdb_prompt} $" {
+ # After stepping out of a function /r signal-handler, GDB will
+ # advance the inferior until it is at the first instruction of
+ # a code-line. While typically things return to the middle of
+ # the "while..." (and hence GDB advances the inferior to the
+ # "return..." line) it is also possible for the return to land
+ # on the first instruction of "while...". Accept both cases.
+ pass "$test"
+ }
}
}
}
-proc advancei { i } {
- global gdb_prompt inferior_exited_re
- set prefix "$i from handleri"
- set program_exited 0
-
- # Get us back into the handler
- gdb_test "continue" ".* handler .*" "$prefix; continue to handler"
-
- set test "$prefix; leave handler"
- gdb_test_multiple "$i" "${test}" {
- -re "Cannot insert breakpoint 0.*${gdb_prompt} $" {
- # Some platforms use a special read-only page for signal
- # trampolines. We can't set a breakpoint there, and we
- # don't gracefully fall back to single-stepping.
- setup_kfail gdb/1736 "i?86-*-linux*"
- setup_kfail gdb/1736 "*-*-openbsd*"
- fail "$test (could not set breakpoint)"
- return
- }
- -re "Could not insert single-step breakpoint.*$gdb_prompt $" {
- setup_kfail gdb/1736 "sparc*-*-openbsd*"
- fail "$test (could not insert single-step breakpoint)"
- }
- -re "Breakpoint \[0-9\]*, handler .*${gdb_prompt} $" {
- fail "$test (hit breakpoint again)"
- }
- -re "done = 1;.*${gdb_prompt} $" {
- send_gdb "$i\n"
- exp_continue -continue_timer
- }
- -re "\} .. handler .*${gdb_prompt} $" {
- send_gdb "$i\n"
- exp_continue -continue_timer
- }
- -re "signal handler called.*${gdb_prompt} $" {
- pass "$test"
- }
- -re "main .*${gdb_prompt} $" {
- fail "$test (in main)"
- }
- -re "$inferior_exited_re normally.*${gdb_prompt} $" {
- fail "$test (program exited)"
- set program_exited 1
- }
- -re "Make handler return now.*y or n. $" {
- send_gdb "y\n"
- exp_continue -continue_timer
+# Map of PREFIX => "things to do within the signal handler", for the
+# advance tests.
+
+set in_handler_map {
+ "nothing" {
+ }
+ "si+advance" {
+ # Advance to the second location in handler.
+ gdb_test "si" "handler.*" "si in handler"
+
+ set test "advance in handler"
+ gdb_test_multiple "advance $other_handler_location" $test {
+ -re "Program received signal SIGTRAP.*$gdb_prompt $" {
+ # On some versions of Linux (observed on
+ # 3.16.4-200.fc20.x86_64), using PTRACE_SINGLESTEP+sig
+ # to step into a signal handler, and then issuing
+ # another PTRACE_SINGLESTEP within the handler ends up
+ # with $eflags.TF mistakenly set, which results in
+ # subsequent PTRACE_CONTINUEs trapping after each
+ # insn.
+ if {$enter_cmd != "continue"} {
+ setup_xfail "i?86-*-linux*" gdb/17511
+ setup_xfail "x86_64-*-linux*" gdb/17511
+ }
+ fail "$test (spurious SIGTRAP)"
+ return
+ }
+ -re "other handler location.*$gdb_prompt $" {
+ pass $test
+ }
}
}
+}
- set test "$prefix; leave signal trampoline"
- gdb_test_multiple "$i" "${test}" {
- -re "while .*${gdb_prompt} $" {
- pass "$test (in main)"
- }
- -re "signal handler called.*${gdb_prompt} $" {
- send_gdb "$i\n"
- exp_continue -continue_timer
- }
- -re "return .*${gdb_prompt} $" {
- fail "$test (stepped)"
- }
- -re "Make .*frame return now.*y or n. $" {
- send_gdb "y\n"
- exp_continue -continue_timer
- }
- -re "$inferior_exited_re normally.*${gdb_prompt} $" {
- kfail gdb/1639 "$test (program exited)"
- set program_exited 1
- }
- -re "The program is not being run.*${gdb_prompt} $" {
- if { $program_exited } {
- # Previously kfailed with an exit
- pass "$test (the program is not being run)"
- } else {
- fail "$test (the program is not being run)"
- }
+# Check that we can step/next/continue, etc. our way in and out of a
+# signal handler. Also test that we can step, and run to a breakpoint
+# within the handler.
+
+foreach enter_cmd { "stepi" "nexti" "step" "next" "continue" } {
+ if { $enter_cmd != "continue" && ![can_single_step_to_signal_handler] } {
+ continue
+ }
+
+ foreach exit_cmd { "step" "next" "continue" } {
+ foreach {in_handler_prefix in_handler} $in_handler_map {
+ advance $enter_cmd $in_handler_prefix $in_handler $exit_cmd
}
}
}
-# Check that we can step/next our way out of a signal handler.
+proc advancei { cmd } {
+ global gdb_prompt inferior_exited_re
-advance step
-advancei stepi
+ with_test_prefix "$cmd from handleri" {
+ restart
+
+ # Get us into the handler.
+ gdb_test "break handler"
+ gdb_test "continue" ".* handler .*" "continue to handler"
+
+ set program_exited 0
+ set test "leave handler"
+ gdb_test_multiple "$cmd" "${test}" {
+ -re "Cannot insert breakpoint 0.*${gdb_prompt} $" {
+ # Some platforms use a special read-only page for signal
+ # trampolines. We can't set a breakpoint there, and we
+ # don't gracefully fall back to single-stepping.
+ setup_kfail gdb/8841 "i?86-*-linux*"
+ setup_kfail gdb/8841 "*-*-openbsd*"
+ fail "$test (could not set breakpoint)"
+ return
+ }
+ -re "Could not insert single-step breakpoint.*$gdb_prompt $" {
+ setup_kfail gdb/8841 "sparc*-*-openbsd*"
+ fail "$test (could not insert single-step breakpoint)"
+ }
+ -re "Breakpoint \[0-9\]*, handler .*${gdb_prompt} $" {
+ fail "$test (hit breakpoint again)"
+ }
+ -re "done = 1;.*${gdb_prompt} $" {
+ send_gdb "$cmd\n"
+ exp_continue -continue_timer
+ }
+ -re "\} .. handler .*${gdb_prompt} $" {
+ send_gdb "$cmd\n"
+ exp_continue -continue_timer
+ }
+ -re "signal handler called.*${gdb_prompt} $" {
+ pass "$test"
+ }
+ -re "main .*${gdb_prompt} $" {
+ fail "$test (in main)"
+ }
+ -re "$inferior_exited_re normally.*${gdb_prompt} $" {
+ fail "$test (program exited)"
+ set program_exited 1
+ }
+ -re "Make handler return now.*y or n. $" {
+ send_gdb "y\n"
+ exp_continue -continue_timer
+ }
+ }
-advance next
-advancei nexti
+ set test "leave signal trampoline"
+ gdb_test_multiple "$cmd" "${test}" {
+ -re "while .*${gdb_prompt} $" {
+ pass "$test (in main)"
+ }
+ -re "signal handler called.*${gdb_prompt} $" {
+ send_gdb "$cmd\n"
+ exp_continue -continue_timer
+ }
+ -re "return .*${gdb_prompt} $" {
+ fail "$test (stepped)"
+ }
+ -re "Make .*frame return now.*y or n. $" {
+ send_gdb "y\n"
+ exp_continue -continue_timer
+ }
+ -re "$inferior_exited_re normally.*${gdb_prompt} $" {
+ kfail gdb/8744 "$test (program exited)"
+ set program_exited 1
+ }
+ -re "The program is not being run.*${gdb_prompt} $" {
+ if { $program_exited } {
+ # Previously kfailed with an exit
+ pass "$test (the program is not being run)"
+ } else {
+ fail "$test (the program is not being run)"
+ }
+ }
+ }
+ }
+}
-advancei finish
-advancei return
-gdb_test_no_output "set done = 1" "Set done as return will have skipped it"
+# Check that we can step our way out of a signal handler, using
+# commands that first step out to the signal trampoline, and then out
+# to the mainline code.
+foreach cmd {"stepi" "nexti" "finish" "return"} {
+ advancei $cmd
+}
# Check that we can step/next our way into / over a signal handler.
# There are at least the following cases: breakpoint @pc VS breakpoint
# in handler VS step / next / continue.
-# Use the real-time itimer, as otherwize the process never gets enough
-# time to expire the timer.
-
-delete_breakpoints
-set infinite_loop [gdb_get_line_number {while (!done)}]
-gdb_test_no_output "set itimer = itimer_real"
-gdb_test "break [gdb_get_line_number {done = 0}]"
# Try stepping when there's a signal pending, and a breakpoint at the
# handler. Should step into the signal handler.
-proc skip_to_handler { i } {
- global gdb_prompt
+proc skip_to_handler { cmd } {
global infinite_loop
- set prefix "$i to handler"
-
- # Run around to the done
- # You can add more patterns to this if you need them.
- set test "$prefix; resync"
- gdb_test_multiple "continue" "$test" {
- -re "done = 0.*$gdb_prompt " {
- pass "$test"
- }
+
+ with_test_prefix "$cmd to handler" {
+ restart
+ # Use the real-time itimer, as otherwize the process never gets
+ # enough time to expire the timer.
+ gdb_test_no_output "set itimer = itimer_real"
+
+ # Advance to the infinite loop.
+ gdb_test "advance $infinite_loop" ".*" "advance to infinite loop"
+
+ # Make the signal pending.
+ sleep 1
+
+ # Insert the handler breakpoint.
+ gdb_test "break handler" ".*" "break handler"
+
+ # Step into the handler.
+ gdb_test "$cmd" " handler .*" "performing $cmd"
}
-
- # Advance to the infinite loop
- gdb_test "advance $infinite_loop" ".*" "$prefix; advance to infinite loop"
-
- # Make the signal pending
- sleep 1
-
- # Insert / remove the handler breakpoint.
- gdb_test "break handler" ".*" "$prefix; break handler"
- gdb_test "$i" " handler .*" "$prefix; performing $i"
- gdb_test "clear handler" ".*" "$prefix; clear handler"
}
-skip_to_handler step
-skip_to_handler next
-skip_to_handler continue
+foreach cmd {"step" "next" "continue"} {
+ skip_to_handler $cmd
+}
# Try stepping when there's a signal pending, and a breakpoint at the
# handler's entry-point. Should step into the signal handler stopping
# have been called by the trampoline code. This test checks that it
# is possible to stop the inferior, even at that first instruction.
-proc skip_to_handler_entry { i } {
- global gdb_prompt
+proc skip_to_handler_entry { cmd } {
global infinite_loop
- set prefix "$i to handler entry"
-
- # Run around to the done
- # You can add more patterns to this if you need them.
- set test "$prefix; resync"
- gdb_test_multiple "continue" "$test" {
- -re "done = 0.*$gdb_prompt " {
- pass "$test"
+
+ with_test_prefix "$cmd to handler entry" {
+ restart
+ # Use the real-time itimer, as otherwize the process never gets
+ # enough time to expire the timer.
+ gdb_test_no_output "set itimer = itimer_real"
+
+ # Advance to the infinite loop.
+ gdb_test "advance $infinite_loop" ".*" "advance to infinite loop"
+
+ # Make the signal pending.
+ sleep 1
+
+ # Insert / remove the handler breakpoint.
+ gdb_test "break *handler" ".*" "break handler"
+ gdb_test "$cmd" " handler .*" "performing $cmd"
+ }
+}
+
+foreach cmd {"stepi" "nexti" "step" "next" "continue"} {
+ skip_to_handler_entry $cmd
+}
+
+# Get the address of where a single-step should land.
+
+proc get_next_pc {test} {
+ global gdb_prompt
+ global hex
+
+ set next ""
+ gdb_test_multiple "x/2i \$pc" $test {
+ -re "$hex .*:\[^\r\n\]+\r\n\[ \]+($hex).*\.\r\n$gdb_prompt $" {
+ set next $expect_out(1,string)
+ pass $test
}
}
-
- # Advance to the infinite loop
- gdb_test "advance $infinite_loop" ".*" "$prefix; advance to infinite loop"
-
- # Make the signal pending
- sleep 1
-
- # Insert / remove the handler breakpoint.
- gdb_test "break *handler" ".*" "$prefix; break handler"
- gdb_test "$i" " handler .*" "$prefix; performing $i"
- gdb_test "clear *handler" ".*" "$prefix; clear handler"
+
+ return $next
}
-skip_to_handler_entry step
-skip_to_handler_entry next
-skip_to_handler_entry continue
+# Test that the command skipped over the handler.
+
+proc test_skip_handler {cmd} {
+ if {$cmd == "stepi" || $cmd == "nexti"} {
+ set next_pc [get_next_pc "get next PC"]
+ gdb_test "$cmd" "dummy = 0.*" "performing $cmd"
+ gdb_test "p /x \$pc" " = $next_pc" "advanced"
+ } else {
+ gdb_test "$cmd" "done = 0.*" "performing $cmd"
+ }
+}
# Try stepping when there's a signal pending but no breakpoints.
# Should skip the handler advancing to the next line.
-proc skip_over_handler { i } {
- global gdb_prompt
+proc skip_over_handler { cmd } {
global infinite_loop
- set prefix "$i over handler"
-
- # Run around to the done
- # You can add more patterns to this if you need them.
- set test "$prefix; resync"
- gdb_test_multiple "continue" "$test" {
- -re "done = 0.*$gdb_prompt " {
- pass "$test"
- }
+ global clear_done
+
+ with_test_prefix "$cmd over handler" {
+ restart
+ # Use the real-time itimer, as otherwize the process never gets
+ # enough time to expire the timer.
+ gdb_test_no_output "set itimer = itimer_real"
+
+ gdb_test "break $clear_done" ".*" "break clear done"
+
+ # Advance to the infinite loop.
+ gdb_test "advance $infinite_loop" ".*" "advance to infinite loop"
+
+ # Make the signal pending.
+ sleep 1
+
+ test_skip_handler $cmd
}
-
- # Advance to the infinite loop
- gdb_test "advance $infinite_loop" ".*" "$prefix; advance to infinite loop"
-
- # Make the signal pending
- sleep 1
-
- gdb_test "$i" "done = 0.*" "$prefix; performing $i"
}
-skip_over_handler step
-skip_over_handler next
-skip_over_handler continue
+foreach cmd {"stepi" "nexti" "step" "next" "continue"} {
+ skip_over_handler $cmd
+}
# Try stepping when there's a signal pending, a pre-existing
# breakpoint at the current instruction, and a breakpoint in the
# handler. Should advance to the signal handler.
-proc breakpoint_to_handler { i } {
- global gdb_prompt
+proc breakpoint_to_handler { cmd } {
global infinite_loop
- set prefix "$i on breakpoint, to handler"
-
- # Run around to the done
- # You can add more patterns to this if you need them.
- set test "$prefix; resync"
- gdb_test_multiple "continue" "$test" {
- -re "done = 0.*$gdb_prompt " {
- pass "$test"
- }
+
+ with_test_prefix "$cmd on breakpoint, to handler" {
+ restart
+ # Use the real-time itimer, as otherwize the process never gets
+ # enough time to expire the timer.
+ gdb_test_no_output "set itimer = itimer_real"
+
+ gdb_test "break $infinite_loop" ".*" "break infinite loop"
+ gdb_test "break handler" ".*" "break handler"
+
+ # Continue to the infinite loop.
+ gdb_test "continue" "while ..done.*" "continue to infinite loop"
+
+ # Make the signal pending.
+ sleep 1
+
+ gdb_test "$cmd" " handler .*" "performing $cmd"
}
-
- gdb_test "break $infinite_loop" ".*" "$prefix; break infinite loop"
- gdb_test "break handler" ".*" "$prefix; break handler"
-
- # Continue to the infinite loop
- gdb_test "continue" "while ..done.*" "$prefix; continue to infinite loop"
-
- # Make the signal pending
- sleep 1
-
- gdb_test "$i" " handler .*" "$prefix; performing $i"
- gdb_test "clear $infinite_loop" ".*" "$prefix; clear infinite loop"
- gdb_test "clear handler" ".*" "$prefix; clear handler"
}
-breakpoint_to_handler step
-breakpoint_to_handler next
-breakpoint_to_handler continue
+foreach cmd {"step" "next" "continue"} {
+ breakpoint_to_handler $cmd
+}
# Try stepping when there's a signal pending, and a breakpoint at the
# handler's entry instruction and a breakpoint at the current
# have been called by the trampoline code. This test checks that it
# is possible to stop the inferior, even at that first instruction.
-proc breakpoint_to_handler_entry { i } {
- global gdb_prompt
+proc breakpoint_to_handler_entry { cmd } {
global infinite_loop
- set prefix "$i on breakpoint, to handler entry"
-
- # Run around to the done
- # You can add more patterns to this if you need them.
- set test "$prefix; resync"
- gdb_test_multiple "continue" "$test" {
- -re "done = 0.*$gdb_prompt " {
- pass "$test"
- }
+
+ with_test_prefix "$cmd on breakpoint, to handler entry" {
+ restart
+ # Use the real-time itimer, as otherwize the process never gets
+ # enough time to expire the timer.
+ gdb_test_no_output "set itimer = itimer_real"
+
+ gdb_test "break $infinite_loop" ".*" "break infinite loop"
+ gdb_test "break *handler" ".*" "break handler"
+
+ # Continue to the infinite loop.
+ gdb_test "continue" "while ..done.*" "continue to infinite loop"
+
+ # Make the signal pending.
+ sleep 1
+
+ gdb_test "$cmd" " handler .*" "performing $cmd"
}
-
- gdb_test "break $infinite_loop" ".*" "$prefix; break infinite loop"
- gdb_test "break *handler" ".*" "$prefix; break handler"
-
- # Continue to the infinite loop
- gdb_test "continue" "while ..done.*" "$prefix; continue to infinite loop"
-
- # Make the signal pending
- sleep 1
-
- gdb_test "$i" " handler .*" "$prefix; performing $i"
- gdb_test "clear $infinite_loop" ".*" "$prefix; clear infinite loop"
- gdb_test "clear *handler" ".*" "$prefix; clear handler"
}
-breakpoint_to_handler_entry step
-breakpoint_to_handler_entry next
-breakpoint_to_handler_entry continue
+foreach cmd {"step" "next" "continue"} {
+ breakpoint_to_handler_entry $cmd
+}
# Try stepping when there's a signal pending, and a pre-existing
# breakpoint at the current instruction, and no breakpoint in the
-# handler. Should advance to the next line.
-
-proc breakpoint_over_handler { i } {
- global gdb_prompt
+# handler. Should advance to the next line/instruction. If SW_WATCH
+# is true, set a software watchpoint, which exercises stepping the
+# breakpoint instruction while delivering a signal at the same time.
+# If NO_HANDLER, arrange for the signal's handler be SIG_IGN, thus
+# when the software watchpoint is also set, testing stepping a
+# breakpoint instruction and immediately triggering the breakpoint
+# (exercises adjust_pc_after_break logic).
+
+proc breakpoint_over_handler { cmd with_sw_watch no_handler } {
global infinite_loop
- set prefix "$i on breakpoint, skip handler"
-
- # Run around to the done
- # You can add more patterns to this if you need them.
- set test "$prefix; resync"
- gdb_test_multiple "continue" "$test" {
- -re "done = 0.*$gdb_prompt " {
- pass "$test"
- }
+ global clear_done
+
+ set prefix "$cmd on breakpoint, skip handler"
+ if { $with_sw_watch } {
+ append prefix ", with sw-watchpoint"
+ }
+ if { $no_handler } {
+ append prefix ", no handler"
}
-
- gdb_test "break $infinite_loop" ".*" "$prefix; break infinite loop"
- # Continue to the infinite loop
- gdb_test "continue" "while ..done.*" "$prefix; continue to infinite loop"
+ with_test_prefix "$prefix" {
+ restart
+ # Use the real-time itimer, as otherwize the process never gets
+ # enough time to expire the timer.
+ gdb_test_no_output "set itimer = itimer_real"
+
+ if {$no_handler} {
+ gdb_test "print no_handler = 1" " = 1" \
+ "set no_handler"
+ }
+
+ gdb_test "break $infinite_loop" ".*" "break infinite loop"
+
+ gdb_test "break $clear_done" ".*" "break clear done"
+
+ # Continue to the infinite loop
+ gdb_test "continue" "while ..done.*" "continue to infinite loop"
+
+ # Make the signal pending
+ sleep 1
- # Make the signal pending
- sleep 1
-
- gdb_test "$i" "done = 0.*" "$prefix; performing $i"
- gdb_test "clear $infinite_loop" ".*" "$prefix; clear infinite loop"
+ if { $with_sw_watch } {
+ # A watchpoint on a convenience variable is always a
+ # software watchpoint.
+ gdb_test "watch \$convenience" "Watchpoint .*: \\\$convenience"
+ }
+
+ if {$no_handler} {
+ # With no handler, we need to set the global ourselves
+ # manually.
+ gdb_test "print done = 1" " = 1" "set done"
+ }
+
+ test_skip_handler $cmd
+ }
}
-breakpoint_over_handler step
-breakpoint_over_handler next
-breakpoint_over_handler continue
+foreach cmd {"stepi" "nexti" "step" "next" "continue"} {
+ foreach with_sw_watch {0 1} {
+ foreach no_handler {0 1} {
+ breakpoint_over_handler $cmd $with_sw_watch $no_handler
+ }
+ }
+}
projects / platform / upstream / gdb.git / blobdiff