1bfeeb0f75
* Makefile.in: (SFILES): Add skip.c. (HFILES_NO_SRCDIR): Add skip.h. (COMMON_OBS): Add skip.o. * skip.h, skip.c: New. * breakpoint.h (set_default_breakpoint): Remove. (get_sal_arch): Declare. * breakpoint.c: Remove default_breakpoint_valid, default_breakpoint_address, default_breakpoint_symtab, default_breakpoint_line, default_breakpoint_pspace variables. (get_sal_arch): Make public. (set_default_breakpoint): Remove. (parse_breakpoint_sals, create_breakpoint, clear_command, decode_line_spec_1): Remove uses of default_breakpoint variables; replaced with function calls into stack.c. * cli/cli-cmds.h: Add cmd_list_element *skiplist. * cli/cli-cmds.c: Add skiplist. (init_cmd_lists): Initialize skiplist. (init_cli_cmds): Fix comment (classes of commands appear in alphabetical order). * infrun.c (handle_inferior_event): Add check that we don't step into a function whose pc is marked for skip. * stack.c: Declare last_displayed_sal_valid, last_displayed_pspace, last_displayed_addr, last_displayed_symtab, last_displayed_line variables. (set_last_displayed_sal): New static function. (print_frame_info): Switch call to set_default_breakpoint to call to set_last_displayed_sal. (clear_last_displayed_sal, last_displayed_sal_is_valid, get_last_displayed_pspace, get_last_displayed_addr, get_last_displayed_symtab, get_last_displayed_line, get_last_displayed_sal): New public functions. * stack.h (clear_last_displayed_sal, last_displayed_sal_is_valid, get_last_displayed_pspace, get_last_displayed_addr, get_last_displayed_symtab, get_last_displayed_line, get_last_displayed_sal): Declare. 2011-10-06 Justin Lebar <justin.lebar@gmail.com> Add tests for skip command. * testsuite/gdb.base/skip-solib-lib.c: New * testsuite/gdb.base/skip-solib-main.c: New * testsuite/gdb.base/skip-solib.exp: New * testsuite/gdb.base/skip.c: New * testsuite/gdb.base/skip.exp: New * testsuite/gdb.base/skip1.c: New * testsuite/gdb.base/Makefile.in: Adding new files.
179 lines
6.3 KiB
Text
179 lines
6.3 KiB
Text
# Copyright 2011 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 was written by Justin Lebar. (justin.lebar@gmail.com)
|
|
|
|
if { [prepare_for_testing skip.exp "skip" \
|
|
{skip.c skip1.c } \
|
|
{debug nowarnings}] } {
|
|
return -1
|
|
}
|
|
|
|
set srcfile skip.c
|
|
set srcfile1 skip1.c
|
|
|
|
#
|
|
# Right after we start gdb, there's no default file or function to skip.
|
|
#
|
|
gdb_test "skip file" "No default file now."
|
|
gdb_test "skip function" "No default function now."
|
|
gdb_test "skip" "No default function now."
|
|
|
|
if ![runto_main] { fail "skip tests suppressed" }
|
|
|
|
#
|
|
# Test |info skip| with an empty skiplist.
|
|
#
|
|
gdb_test "info skip" "Not skipping any files or functions\." "info skip empty"
|
|
|
|
#
|
|
# Create a skiplist entry for the current file and function.
|
|
#
|
|
gdb_test "skip file" "File .*$srcfile will be skipped when stepping\."
|
|
gdb_test "skip" "Function main at .* will be skipped when stepping\."
|
|
|
|
#
|
|
# Create a skiplist entry for a specified file and function.
|
|
#
|
|
gdb_test "skip file skip1.c" "File .*$srcfile1 will be skipped when stepping\."
|
|
gdb_test "skip function baz" "Function baz at .* will be skipped when stepping\."
|
|
|
|
#
|
|
# Test bad skiplist entry modification commands
|
|
#
|
|
gdb_test "skip enable 999" "No skiplist entries found with number 999."
|
|
gdb_test "skip disable 999" "No skiplist entries found with number 999."
|
|
gdb_test "skip delete 999" "No skiplist entries found with number 999."
|
|
gdb_test "skip enable a" "Args must be numbers or '\\$' variables."
|
|
gdb_test "skip disable a" "Args must be numbers or '\\$' variables."
|
|
gdb_test "skip delete a" "Args must be numbers or '\\$' variables."
|
|
|
|
#
|
|
# Ask for info on a skiplist entry which doesn't exist.
|
|
#
|
|
gdb_test "info skip 999" "No skiplist entries found with number 999."
|
|
|
|
#
|
|
# Does |info skip| look right?
|
|
#
|
|
gdb_test "info skip" \
|
|
"Num\\s+Type\\s+Enb\\s+Address\\s+What\\s*
|
|
1\\s+file\\s+y\\s+.*$srcfile\\s*
|
|
2\\s+function\\s+y\\s+0x\[0-9a-f\]+ main at .*$srcfile:\[0-9\]+\\s*
|
|
3\\s+file\\s+y\\s+.*$srcfile1\\s*
|
|
4\\s+function\\s+y\\s+0x\[0-9a-f\]+ baz at .*$srcfile1:\[0-9\]+\\s*"
|
|
|
|
#
|
|
# Right now, we have an outstanding skiplist entry on both source
|
|
# files, so when we step into the first line in main(), we should step
|
|
# right over it and go to the second line of main().
|
|
#
|
|
|
|
if ![runto_main] { fail "skip tests suppressed" }
|
|
gdb_test "step"
|
|
gdb_test "bt" "\\s*\\#0\\s+main.*" "step after all ignored"
|
|
|
|
#
|
|
# Now remove skip.c from the skiplist. Our first step should take us
|
|
# into foo(), and our second step should take us to the next line in
|
|
# main().
|
|
#
|
|
gdb_test "skip delete 1"
|
|
# Check that entry 1 is missing from |info skip|
|
|
gdb_test "info skip" \
|
|
"Num\\s+Type\\s+Enb\\s+Address\\s+What\\s*
|
|
2\\s+function\\s+y\\s+0x\[0-9a-f\]+ main at .*$srcfile:\[0-9\]+\\s*
|
|
3\\s+file\\s+y\\s+.*$srcfile1\\s*
|
|
4\\s+function\\s+y\\s+0x\[0-9a-f\]+ baz at .*$srcfile1:\[0-9\]+\\s*"
|
|
|
|
if ![runto_main] { fail "skip tests suppressed" }
|
|
gdb_test "step" "foo \\(\\) at.*" "step after deleting 1 (1)"
|
|
gdb_test "step"; # Return from foo()
|
|
gdb_test "step" "main \\(\\) at.*" "step after deleting 1 (2)"
|
|
|
|
#
|
|
# Now disable the skiplist entry for skip1.c. We should now
|
|
# step into foo(), then into bar(), but not into baz().
|
|
#
|
|
gdb_test "skip disable 3"
|
|
# Is entry 3 disabled in |info skip|?
|
|
gdb_test "info skip 3" ".*\\n3\\s+file\\s+n.*" \
|
|
"info skip shows entry as disabled"
|
|
|
|
if ![runto_main] { fail "skip tests suppressed" }
|
|
gdb_test "step" "bar \\(\\) at.*" "step after disabling 3 (1)"
|
|
gdb_test "step"; # Return from foo()
|
|
gdb_test "step" "foo \\(\\) at.*" "step after disabling 3 (2)"
|
|
gdb_test "step"; # Return from bar()
|
|
gdb_test "step" "main \\(\\) at.*" "step after disabling 3 (3)"
|
|
|
|
#
|
|
# Enable skiplist entry 3 and make sure we step over it like before.
|
|
#
|
|
gdb_test "skip enable 3"
|
|
# Is entry 3 enabled in |info skip|?
|
|
gdb_test "info skip 3" ".*\\n3\\s+file\\s+y.*" \
|
|
"info skip shows entry as enabled"
|
|
if ![runto_main] { fail "skip tests suppressed" }
|
|
gdb_test "step" "foo \\(\\) at.*" "step after deleting 1 (1)"
|
|
gdb_test "step"; # Return from foo()
|
|
gdb_test "step" "main \\(\\) at.*" "step after deleting 1 (2)"
|
|
|
|
gdb_test "skip disable"
|
|
gdb_test "info skip" \
|
|
"Num\\s+Type\\s+Enb\\s+Address\\s+What\\s*
|
|
2\\s+function\\s+n\\s+0x\[0-9a-f\]+ main at .*$srcfile:\[0-9\]+\\s*
|
|
3\\s+file\\s+n\\s+.*$srcfile1\\s*
|
|
4\\s+function\\s+n\\s+0x\[0-9a-f\]+ baz at .*$srcfile1:\[0-9\]+\\s*" \
|
|
"info skip after disabling all"
|
|
|
|
gdb_test "skip enable"
|
|
gdb_test "info skip" \
|
|
"Num\\s+Type\\s+Enb\\s+Address\\s+What\\s*
|
|
2\\s+function\\s+y\\s+0x\[0-9a-f\]+ main at .*$srcfile:\[0-9\]+\\s*
|
|
3\\s+file\\s+y\\s+.*$srcfile1\\s*
|
|
4\\s+function\\s+y\\s+0x\[0-9a-f\]+ baz at .*$srcfile1:\[0-9\]+\\s*" \
|
|
"info skip after enabling all"
|
|
|
|
gdb_test "skip disable 4 2-3"
|
|
gdb_test "info skip" \
|
|
"Num\\s+Type\\s+Enb\\s+Address\\s+What\\s*
|
|
2\\s+function\\s+n\\s+0x\[0-9a-f\]+ main at .*$srcfile:\[0-9\]+\\s*
|
|
3\\s+file\\s+n\\s+.*$srcfile1\\s*
|
|
4\\s+function\\s+n\\s+0x\[0-9a-f\]+ baz at .*$srcfile1:\[0-9\]+\\s*" \
|
|
"info skip after disabling 4 2-3"
|
|
|
|
gdb_test "skip enable 2-3"
|
|
gdb_test "info skip" \
|
|
"Num\\s+Type\\s+Enb\\s+Address\\s+What\\s*
|
|
2\\s+function\\s+y\\s+0x\[0-9a-f\]+ main at .*$srcfile:\[0-9\]+\\s*
|
|
3\\s+file\\s+y\\s+.*$srcfile1\\s*
|
|
4\\s+function\\s+n\\s+0x\[0-9a-f\]+ baz at .*$srcfile1:\[0-9\]+\\s*" \
|
|
"info skip after enabling 2-3"
|
|
|
|
gdb_test "info skip 2-3" \
|
|
"Num\\s+Type\\s+Enb\\s+Address\\s+What\\s*
|
|
2\\s+function\\s+y\\s+0x\[0-9a-f\]+ main at .*$srcfile:\[0-9\]+\\s*
|
|
3\\s+file\\s+y\\s+.*$srcfile1\\s*" \
|
|
"info skip 2-3"
|
|
|
|
gdb_test "skip delete 2 3"
|
|
gdb_test "info skip" \
|
|
"4\\s+function\\s+n\\s+0x\[0-9a-f\]+ baz at .*$srcfile1:\[0-9\]+\\s*" \
|
|
"info skip after deleting 2 3"
|
|
|
|
gdb_test "skip delete"
|
|
gdb_test "info skip" "Not skipping any files or functions\." \
|
|
"info skip after deleting all"
|