return -1
}
-proc gdbvar_simple_if_test {} {
+proc_with_prefix gdbvar_simple_if_test {} {
global gdb_prompt
- gdb_test_no_output "set \$foo = 0" "set foo in gdbvar_simple_if_test"
+ gdb_test_no_output "set \$foo = 0" "set foo"
# All this test should do is print 0xdeadbeef once.
gdb_test "if \$foo == 1\np/x 0xfeedface\nelse\np/x 0xdeadbeef\nend" \
- "\\\$\[0-9\]* = 0xdeadbeef" "gdbvar_simple_if_test #1"
+ "\\\$\[0-9\]* = 0xdeadbeef" "#1"
# All this test should do is print 0xfeedface once.
gdb_test "if \$foo == 0\np/x 0xfeedface\nelse\np/x 0xdeadbeef\nend" \
- "\\\$\[0-9\]* = 0xfeedface" "gdbvar_simple_if_test #2"
+ "\\\$\[0-9\]* = 0xfeedface" "#2"
}
-proc gdbvar_simple_while_test {} {
+proc_with_prefix gdbvar_simple_while_test {} {
global gdb_prompt
- gdb_test_no_output "set \$foo = 5" "set foo in gdbvar_simple_while_test"
+ gdb_test_no_output "set \$foo = 5" "set foo"
# This test should print 0xfeedface five times.
gdb_test "while \$foo > 0\np/x 0xfeedface\nset \$foo -= 1\nend" \
"\\\$\[0-9\]* = 0xfeedface\[^\n\]*\n\\\$\[0-9\]* = 0xfeedface\[^\n\]*\n\\\$\[0-9\]* = 0xfeedface\[^\n\]*\n\\\$\[0-9\]* = 0xfeedface\[^\n\]*\n\\\$\[0-9\]* = 0xfeedface" \
- "gdbvar_simple_while_test #1"
+ "#1"
}
-proc gdbvar_complex_if_while_test {} {
+proc_with_prefix gdbvar_complex_if_while_test {} {
global gdb_prompt
gdb_test_no_output "set \$foo = 4" \
- "set foo in gdbvar complex_if_while_test"
+ "set foo"
# This test should alternate between 0xdeadbeef and 0xfeedface two times.
gdb_test "while \$foo > 0\nset \$foo -= 1\nif \(\$foo % 2\) == 1\np/x 0xdeadbeef\nelse\np/x 0xfeedface\nend\nend" \
"\\\$\[0-9\]* = 0xdeadbeef\[^\n\]*\n\\\$\[0-9\]* = 0xfeedface\[^\n\]*\n\\\$\[0-9\]* = 0xdeadbeef\[^\n\]*\n\\\$\[0-9\]* = 0xfeedface" \
- "gdbvar_complex_if_while_test #1"
+ "#1"
}
-proc progvar_simple_if_test {} {
+proc_with_prefix progvar_simple_if_test {} {
global gdb_prompt
if { ![runto factorial] } then { gdb_suppress_tests; }
# Don't depend upon argument passing, since most simulators don't
# currently support it. Bash value variable to be what we want.
- gdb_test "p value=5" ".*" "set value to 5 in progvar_simple_if_test #1"
+ gdb_test "p value=5" ".*" "set value to 5"
# All this test should do is print 0xdeadbeef once.
gdb_test "if value == 1\np/x 0xfeedface\nelse\np/x 0xdeadbeef\nend" \
"\\\$\[0-9\]* = 0xdeadbeef" \
- "progvar_simple_if_test #1"
+ "#1"
# All this test should do is print 0xfeedface once.
gdb_test "if value == 5\np/x 0xfeedface\nelse\np/x 0xdeadbeef\nend" \
"\\\$\[0-9\]* = 0xfeedface" \
- "progvar_simple_if_test #2"
+ "#2"
gdb_stop_suppressing_tests
}
-proc progvar_simple_while_test {} {
+proc_with_prefix progvar_simple_while_test {} {
global gdb_prompt
if { ![runto factorial] } then { gdb_suppress_tests }
# Don't depend upon argument passing, since most simulators don't
# currently support it. Bash value variable to be what we want.
- gdb_test "p value=5" ".*" "set value to 5 in progvar_simple_if_test #2"
+ gdb_test "p value=5" ".*" "set value to 5"
# This test should print 0xfeedface five times.
gdb_test "while value > 0\np/x 0xfeedface\nset value -= 1\nend" \
"\\\$\[0-9\]* = 0xfeedface\[^\n\]*\n\\\$\[0-9\]* = 0xfeedface\[^\n\]*\n\\\$\[0-9\]* = 0xfeedface\[^\n\]*\n\\\$\[0-9\]* = 0xfeedface\[^\n\]*\n\\\$\[0-9\]* = 0xfeedface" \
- "progvar_simple_while_test #1"
+ "#1"
gdb_stop_suppressing_tests
}
-proc progvar_complex_if_while_test {} {
+proc_with_prefix progvar_complex_if_while_test {} {
global gdb_prompt
if { ![runto factorial] } then { gdb_suppress_tests }
# Don't depend upon argument passing, since most simulators don't
# currently support it. Bash value variable to be what we want.
- gdb_test "p value=4" ".*" "set value to 4 in progvar_simple_if_test"
+ gdb_test "p value=4" ".*" "set value to 4"
# This test should alternate between 0xdeadbeef and 0xfeedface two times.
gdb_test "while value > 0\nset value -= 1\nif \(value % 2\) == 1\np/x 0xdeadbeef\nelse\np/x 0xfeedface\nend\nend" \
"\\\$\[0-9\]* = 0xdeadbeef\[^\n\]*\n\\\$\[0-9\]* = 0xfeedface\[^\n\]*\n\\\$\[0-9\]* = 0xdeadbeef\[^\n\]*\n\\\$\[0-9\]* = 0xfeedface" \
- "progvar_complex_if_while_test #1"
+ "#1"
gdb_stop_suppressing_tests
}
-proc if_while_breakpoint_command_test {} {
+proc_with_prefix if_while_breakpoint_command_test {} {
if { ![runto factorial] } then { gdb_suppress_tests }
# Don't depend upon argument passing, since most simulators don't
# currently support it. Bash value variable to be what we want.
- gdb_test "p value=5" ".*" "set value to 5 in progvar_simple_if_test"
+ gdb_test "p value=5" ".*" "set value to 5"
delete_breakpoints
- gdb_test "break factorial" "Breakpoint.*at.*" "break factorial #1"
+ gdb_test "break factorial" "Breakpoint.*at.*" "break factorial"
- gdb_test_multiple "commands" \
- "commands in if_while_breakpoint_command_test" {
- -re "End with" {
- pass "commands in if_while_breakpoint_command_test"
- }
+ gdb_test_multiple "commands" "commands" {
+ -re "End with" {
+ pass "commands"
}
+ }
# This test should alternate between 0xdeadbeef and 0xfeedface two times.
gdb_test "while value > 0\nset value -= 1\nif \(value % 2\) == 1\np/x 0xdeadbeef\nelse\np/x 0xfeedface\nend\nend\nend" \
"" \
- "commands part 2 in if_while_breakpoint_command_test"
+ "commands part 2"
gdb_test "continue" \
"\\\$\[0-9\]* = 0xdeadbeef\[^\n\]*\n\\\$\[0-9\]* = 0xfeedface\[^\n\]*\n\\\$\[0-9\]* = 0xdeadbeef\[^\n\]*\n\\\$\[0-9\]* = 0xfeedface" \
- "if_while_breakpoint_command_test #1"
- gdb_test "info break" \
- "while.*set.*if.*p/x.*else.*p/x.*end.*" \
- "info break in if_while_breakpoint_command_test"
+ "#1"
+ gdb_test "info break" "while.*set.*if.*p/x.*else.*p/x.*end.*"
gdb_stop_suppressing_tests
}
# shall be ignored. See the gdb manual, "Break Commands",
# subsection "Breakpoint command lists".
-proc infrun_breakpoint_command_test {} {
+proc_with_prefix infrun_breakpoint_command_test {} {
if { ![runto factorial] } then { gdb_suppress_tests }
# Don't depend upon argument passing, since most simulators don't
# currently support it. Bash value variable to be what we want.
- gdb_test "p value=6" ".*" "set value to 6 in progvar_simple_if_test #1"
+ gdb_test "p value=6" ".*" "set value to 6"
delete_breakpoints
gdb_test "break factorial if value == 5" "Breakpoint.*at.*"
# to get around a synchronization problem in expect.
# part1: issue the gdb command "commands"
# part2: send the list of commands
- gdb_test_multiple "commands" \
- "commands in infrun_breakpoint_command_test #1" {
- -re "End with" {
- pass "commands in infrun_breakpoint_command_test #1"
- }
+
+ set test "commands #1"
+ gdb_test_multiple "commands" $test {
+ -re "End with" {
+ pass $test
}
+ }
gdb_test "step\nstep\nstep\nstep\nend" "" \
- "commands in infrun_breakpoint_command_test #2"
+ "commands #2"
gdb_test "continue" \
- "Continuing.*.*.*Breakpoint \[0-9\]*, factorial \\(value=5\\).*at.*\[0-9\]*\[ \]*if \\(value > 1\\) \{.*\[0-9\]*\[ \]*value \\*= factorial \\(value - 1\\);.*" \
- "continue in infrun_breakpoint_command_test"
+ "Continuing.*.*.*Breakpoint \[0-9\]*, factorial \\(value=5\\).*at.*\[0-9\]*\[ \]*if \\(value > 1\\) \{.*\[0-9\]*\[ \]*value \\*= factorial \\(value - 1\\);.*"
gdb_stop_suppressing_tests
}
-proc breakpoint_command_test {} {
+proc_with_prefix breakpoint_command_test {} {
if { ![runto factorial] } then { gdb_suppress_tests; }
# Don't depend upon argument passing, since most simulators don't
# currently support it. Bash value variable to be what we want.
- gdb_test "p value=6" ".*" "set value to 6 in progvar_simple_if_test #2"
+ gdb_test "p value=6" ".*" "set value to 6"
delete_breakpoints
- gdb_test "break factorial" "Breakpoint.*at.*" "break factorial #2"
+ gdb_test "break factorial" "Breakpoint.*at.*"
gdb_test "commands\nprintf \"Now the value is %d\\n\", value\nend" \
- "End with.*" "commands in breakpoint_command_test"
+ "End with.*" "commands"
gdb_test "continue" \
- "Breakpoint \[0-9\]*, factorial.*Now the value is 5" \
- "continue in breakpoint_command_test"
- gdb_test "print value" " = 5" "print value in breakpoint_command_test"
+ "Breakpoint \[0-9\]*, factorial.*Now the value is 5"
+ gdb_test "print value" " = 5"
gdb_stop_suppressing_tests
}
# Test a simple user defined command (with arguments)
-proc user_defined_command_test {} {
+proc_with_prefix user_defined_command_test {} {
global gdb_prompt
- gdb_test_no_output "set \$foo = 4" \
- "set foo in user_defined_command_test"
+ gdb_test_no_output "set \$foo = 4" "set foo"
- gdb_test_multiple "define mycommand" \
- "define mycommand in user_defined_command_test" {
- -re "End with" {
- pass "define mycommand in user_defined_command_test"
- }
+ gdb_test_multiple "define mycommand" "define mycommand" {
+ -re "End with" {
+ pass "define mycommand"
}
+ }
# This test should alternate between 0xdeadbeef and 0xfeedface two times.
gdb_test "while \$arg0 > 0\nset \$arg0 -= 1\nif \(\$arg0 % 2\) == 1\np/x 0xdeadbeef\nelse\np/x 0xfeedface\nend\nend\nend" \
"" \
- "enter commands in user_defined_command_test"
+ "enter commands"
gdb_test "mycommand \$foo" \
"\\\$\[0-9\]* = 0xdeadbeef\[^\n\]*\n\\\$\[0-9\]* = 0xfeedface\[^\n\]*\n\\\$\[0-9\]* = 0xdeadbeef\[^\n\]*\n\\\$\[0-9\]* = 0xfeedface" \
- "execute user defined command in user_defined_command_test"
+ "execute user-defined command"
gdb_test "show user mycommand" \
" while \\\$arg0.*set.* if \\\(\\\$arg0.*p/x.* else\[^\n\].*p/x.* end\[^\n\].* end\[^\n\].*" \
- "display user command in user_defined_command_test"
+ "display user command"
# Create and test a user-defined command with an empty body.
- gdb_test_multiple "define myemptycommand" \
- "define myemptycommand in user_defined_command_test" {
- -re "End with" {
- pass "define myemptycommand in user_defined_command_test"
- }
+ gdb_test_multiple "define myemptycommand" "define myemptycommand" {
+ -re "End with" {
+ pass "define myemptycommand"
}
+ }
gdb_test "end" \
"" \
"end definition of user-defined command with empty body"
gdb_test_no_output "myemptycommand" \
- "execute user-defined empty command in user_defined_command_test"
+ "execute user-defined empty command"
gdb_test "show user" \
"User command \"myemptycommand.*" \
- "display empty command in command list in user_defined_command_test"
+ "display empty command in command list"
gdb_test "show user myemptycommand" \
"User command \"myemptycommand.*" \
- "display user-defined empty command in user_defined_command_test"
+ "display user-defined empty command"
}
-proc watchpoint_command_test {} {
+proc_with_prefix watchpoint_command_test {} {
global gdb_prompt
# Disable hardware watchpoints if necessary.
}
}
-proc test_command_prompt_position {} {
+proc_with_prefix test_command_prompt_position {} {
global gdb_prompt
if { ![runto factorial] } then { gdb_suppress_tests; }
# Don't depend upon argument passing, since most simulators don't
# currently support it. Bash value variable to be what we want.
delete_breakpoints
- gdb_test "break factorial" "Breakpoint.*at.*" "break factorial #3"
- gdb_test "p value=5" ".*" "set value to 5 in test_command_prompt_position"
+ gdb_test "break factorial" "Breakpoint.*at.*"
+ gdb_test "p value=5" ".*" "set value to 5"
# All this test should do is print 0xdeadbeef once.
gdb_test "if value == 1\np/x 0xfeedface\nelse\np/x 0xdeadbeef\nend" \
"\\\$\[0-9\]* = 0xdeadbeef" \
- "if test in test_command_prompt_position"
+ "if test"
# Now let's test for the correct position of the '>' in gdb's
# prompt for commands. It should be at the beginning of the line,
send_gdb "end\n"
gdb_expect {
-re "^end\r\n$gdb_prompt $" {
- pass "> OK in test_command_prompt_position"
+ pass "> OK"
}
-re ".*$gdb_prompt $" {
- fail "some other message in test_command_prompt_position"
+ fail "some other message"
}
timeout {
- fail "(timeout) 1 in test_command_prompt_position"
+ fail "(timeout) 1"
}
}
}
- -re "^ >$" { fail "> not OK in test_command_prompt_position" }
+ -re "^ >$" { fail "> not OK" }
-re ".*$gdb_prompt $" {
- fail "wrong message in test_command_prompt_position"
+ fail "wrong message"
}
timeout {
- fail "(timeout) 2 in test_command_prompt_position "
+ fail "(timeout) 2"
}
}
}
-re "Type commands.*End with.*\[\r\n\] >$" {
- fail "prompt not OK in test_command_prompt_position"
+ fail "prompt not OK"
}
-re ".*$gdb_prompt $" {
- fail "commands in test_command_prompt_position"
+ fail "commands"
}
- timeout { fail "(timeout) 3 commands in test_command_prompt_position" }
+ timeout { fail "(timeout) 3" }
}
gdb_stop_suppressing_tests
-proc deprecated_command_test {} {
+proc_with_prefix deprecated_command_test {} {
gdb_test "maintenance deprecate blah" "Can't find command.*" \
"tried to deprecate non-existing command"
"deprecate with no arguments"
}
-proc bp_deleted_in_command_test {} {
+proc_with_prefix bp_deleted_in_command_test {} {
global gdb_prompt
delete_breakpoints
# Create a breakpoint, and associate a command-list to it, with
# one command that deletes this breakpoint.
gdb_test "break factorial" \
- "Breakpoint \[0-9\]+ at .*: file .*run.c, line \[0-9\]+\." \
- "breakpoint in bp_deleted_in_command_test"
+ "Breakpoint \[0-9\]+ at .*: file .*run.c, line \[0-9\]+\."
- gdb_test_multiple "commands" "begin commands in bp_deleted_in_command_test" {
+ gdb_test_multiple "commands" "begin commands" {
-re "Type commands for breakpoint.*>$" {
- pass "begin commands in bp_deleted_in_command_test"
+ pass "begin commands"
}
}
gdb_test_multiple "silent" "add silent command" {
gdb_test "" "factorial command-list executed.*" "run factorial until breakpoint"
}
-proc temporary_breakpoint_commands {} {
+proc_with_prefix temporary_breakpoint_commands {} {
global gdb_prompt
delete_breakpoints
# breakpoint is hit.
gdb_test "tbreak factorial" \
"Temporary breakpoint \[0-9\]+ at .*: file .*run.c, line \[0-9\]+\." \
- "breakpoint in temporary_breakpoint_commands"
-
+ "breakpoint"
+
gdb_test_multiple "commands" \
"begin commands in bp_deleted_in_command_test" {
-re "Type commands for breakpoint.*>$" {
- pass "begin commands in bp_deleted_in_command_test"
+ pass "begin commands"
}
}
gdb_test_multiple "silent" "add silent tbreak command" {
# Test that GDB can handle $arg0 outside of user functions without
# crashing.
-proc stray_arg0_test { } {
+proc_with_prefix stray_arg0_test { } {
gdb_test "print \$arg0" \
"\\\$\[0-9\]* = void" \
- "stray_arg0_test #1"
+ "#1"
gdb_test "if 1 == 1\nprint \$arg0\nend" \
"\\\$\[0-9\]* = void" \
- "stray_arg0_test #2"
+ "#2"
gdb_test "print \$arg0 = 1" \
"\\\$\[0-9\]* = 1" \
- "stray_arg0_test #3"
+ "#3"
gdb_test "print \$arg0" \
"\\\$\[0-9\]* = 1" \
- "stray_arg0_test #4"
+ "#4"
}
# Test that GDB is able to source a file with an indented comment.
-proc source_file_with_indented_comment {} {
+proc_with_prefix source_file_with_indented_comment {} {
set file1 [standard_output_file file1]
set fd [open "$file1" w]
echo Done!\n}
close $fd
- gdb_test "source $file1" "Done!" "source file with indented comment"
+ gdb_test "source $file1" "Done!" "source file"
}
# Test that GDB can handle arguments when sourcing files recursively.
# If the arguments are overwritten with ####### then the test has failed.
-proc recursive_source_test {} {
+proc_with_prefix recursive_source_test {} {
set file1 [standard_output_file file1]
set file2 [standard_output_file file2]
set file3 [standard_output_file file3]
gdb_test "source $file1" \
"1: <<<qwerty>>>\[\r\n]+in file3\[\r\n]+2: <<<qwerty>>>" \
- "recursive source test"
+ "source file"
file delete $file1
file delete $file2
return 0
}
-proc if_commands_test {} {
+proc_with_prefix if_commands_test {} {
global gdb_prompt
- gdb_test_no_output "set \$tem = 1" "set \$tem in if_commands_test"
+ gdb_test_no_output "set \$tem = 1" "set \$tem"
set test "if_commands_test 1"
gdb_test_no_prompt "if \$tem == 2" { >} $test
# Verify an error during "commands" commands execution will prevent any other
# "commands" from other breakpoints at the same location to be executed.
-proc error_clears_commands_left {} {
+proc_with_prefix error_clears_commands_left {} {
set test "hook-stop 1"
gdb_test_multiple {define hook-stop} $test {
-re "End with a line saying just \"end\"\\.\r\n>$" {
gdb_test {echo idle\n} "\r\nidle" "no cmd2"
}
-proc redefine_hook_test {} {
+proc_with_prefix redefine_hook_test {} {
global gdb_prompt
gdb_test "define one\nend" \
"" \
"define hook-one"
- gdb_test_multiple "define one" "redefine one" {
+ set test "redefine one"
+ gdb_test_multiple "define one" $test {
-re "Redefine command .one.. .y or n. $" {
send_gdb "y\n"
exp_continue
}
-re "End with" {
- pass "define one in redefine_hook_test"
- }
- default {
- fail "(timeout or eof) define one in redefine_hook_test"
+ pass $test
}
}
gdb_test "end" \
"" \
- "enter commands for one redefinition in redefine_hook_test"
+ "enter commands for one redefinition"
gdb_test "one" \
"hibob" \
- "execute one command in redefine_hook_test"
+ "execute one command"
}
-proc redefine_backtrace_test {} {
+proc_with_prefix redefine_backtrace_test {} {
global gdb_prompt
gdb_test_multiple "define backtrace" "define backtrace" {
gdb_test "echo hibob\\n\nend" \
"" \
- "enter commands in redefine_backtrace_test"
+ "enter commands"
gdb_test "backtrace" \
"hibob" \
- "execute backtrace command in redefine_backtrace_test"
+ "execute backtrace command"
gdb_test "bt" \
"hibob" \
- "execute bt command in redefine_backtrace_test"
+ "execute bt command"
}
gdbvar_simple_if_test
projects / deliverable / binutils-gdb.git / blobdiff