diff options
Diffstat (limited to 'gdb/testsuite/gdb.base/annota1.exp')
| -rw-r--r-- | gdb/testsuite/gdb.base/annota1.exp | 239 |
1 files changed, 96 insertions, 143 deletions
diff --git a/gdb/testsuite/gdb.base/annota1.exp b/gdb/testsuite/gdb.base/annota1.exp index 241d46b..eeb70d7 100644 --- a/gdb/testsuite/gdb.base/annota1.exp +++ b/gdb/testsuite/gdb.base/annota1.exp @@ -61,8 +61,7 @@ set main_line 32 # The commands we test here produce many lines of output; disable "press # <return> to continue" prompts. -send_gdb "set height 0\n" -gdb_expect -re "$gdb_prompt $" +gdb_test_no_output "set height 0" # # break at main @@ -113,15 +112,14 @@ gdb_expect { # annotate-record # annotate-breakpoints-table-end # -send_gdb "info break\n" -gdb_expect { - -re "\r\n\032\032post-prompt\r\n\r\n\032\032breakpoints-headers\r\n\r\n\032\032field 0\r\nNum \r\n\032\032field 1\r\nType \r\n\032\032field 2\r\nDisp \r\n\032\032field 3\r\nEnb \r\n\032\032field 4\r\nAddress +\r\n\032\032field 5\r\nWhat\r\n\r\n\032\032breakpoints-table\r\n\r\n\032\032record\r\n\r\n\032\032field 0\r\n1 \r\n\032\032field 1\r\nbreakpoint \r\n\032\032field 2\r\nkeep \r\n\032\032field 3\r\ny \r\n\032\032field 4\r\n$hex +\r\n\032\032field 5\r\nin main at ${escapedsrcfile}:$main_line\r\n\r\n\032\032breakpoints-table-end\r\n$gdb_prompt$" \ - {pass "breakpoint info"} - -re "\r\n\032\032post-prompt\r\n\r\n\032\032breakpoints-headers\r\n\r\n\032\032field 0\r\nNum \r\n\032\032field 1\r\nType \r\n\032\032field 2\r\nDisp \r\n\032\032field 3\r\nEnb \r\n\032\032field 4\r\nAddress +\r\n\032\032field 5\r\nWhat\r\n\r\n\032\032breakpoints-table\r\n\r\n\032\032record\r\n\r\n\032\032field 0\r\n1 \r\n\032\032field 1\r\nbreakpoint \r\n\032\032field 2\r\nkeep \r\n\032\032field 3\r\ny \r\n\032\032field 4\r\n$hex +\r\n\032\032field 5\r\nin main at .*${srcfile}:$main_line\r\n\r\n\032\032breakpoints-table-end\r\n$gdb_prompt$" \ - { setup_xfail "*-*-*" 1270 - fail "breakpoint info"} - -re ".*$gdb_prompt$" { fail "breakpoint info" } - timeout { fail "breakpoint info (timeout)" } +gdb_test_multiple "info break" "breakpoint info" { + -re "\r\n\032\032post-prompt\r\n\r\n\032\032breakpoints-headers\r\n\r\n\032\032field 0\r\nNum \r\n\032\032field 1\r\nType \r\n\032\032field 2\r\nDisp \r\n\032\032field 3\r\nEnb \r\n\032\032field 4\r\nAddress +\r\n\032\032field 5\r\nWhat\r\n\r\n\032\032breakpoints-table\r\n\r\n\032\032record\r\n\r\n\032\032field 0\r\n1 \r\n\032\032field 1\r\nbreakpoint \r\n\032\032field 2\r\nkeep \r\n\032\032field 3\r\ny \r\n\032\032field 4\r\n$hex +\r\n\032\032field 5\r\nin main at ${escapedsrcfile}:$main_line\r\n\r\n\032\032breakpoints-table-end\r\n$gdb_prompt$" { + pass "breakpoint info" + } + -re "\r\n\032\032post-prompt\r\n\r\n\032\032breakpoints-headers\r\n\r\n\032\032field 0\r\nNum \r\n\032\032field 1\r\nType \r\n\032\032field 2\r\nDisp \r\n\032\032field 3\r\nEnb \r\n\032\032field 4\r\nAddress +\r\n\032\032field 5\r\nWhat\r\n\r\n\032\032breakpoints-table\r\n\r\n\032\032record\r\n\r\n\032\032field 0\r\n1 \r\n\032\032field 1\r\nbreakpoint \r\n\032\032field 2\r\nkeep \r\n\032\032field 3\r\ny \r\n\032\032field 4\r\n$hex +\r\n\032\032field 5\r\nin main at .*${srcfile}:$main_line\r\n\r\n\032\032breakpoints-table-end\r\n$gdb_prompt$" { + setup_xfail "*-*-*" 1270 + fail "breakpoint info" + } } @@ -145,18 +143,11 @@ gdb_expect { # #exp_internal 1 set binexp [string_to_regexp $binfile] -send_gdb "run\n" -gdb_expect { +gdb_test_multiple "run" "run until main breakpoint" { -re "\r\n\032\032post-prompt\r\nStarting program: $binexp \(\(\r\n\r\n\032\032frames-invalid\)|\(\r\n\r\n\032\032breakpoints-invalid\)\)+\r\n\r\n\032\032starting\(\(\r\n\r\n\032\032frames-invalid\)|\(\r\n\r\n\032\032breakpoints-invalid\)\)*\r\n\r\n\032\032breakpoint 1\r\n\r\nBreakpoint 1, \r\n\032\032frame-begin 0 $hex\r\n\r\n\032\032frame-function-name\r\nmain\r\n\032\032frame-args\r\n \\(\\)\r\n\032\032frame-source-begin\r\n at \r\n\032\032frame-source-file\r\n.*annota1.c\r\n\032\032frame-source-file-end\r\n:\r\n\032\032frame-source-line\r\n$main_line\r\n\032\032frame-source-end\r\n\r\n\r\n\032\032source.*$srcfile:$main_line:.*:beg:$hex\r\n\r\n\032\032frame-end\r\n\r\n\032\032stopped.*$gdb_prompt$" { pass "run until main breakpoint" } - -re ".*$gdb_prompt$" { - fail "run until main breakpoint" - } - timeout { - fail "run until main breakpoint (timeout)" - } - } +} #exp_internal 0 #exit 0 @@ -165,10 +156,10 @@ gdb_expect { # We don't care about the annotated output for this operation, it is the same as # the one produced by run above # -send_gdb "next\n" -gdb_expect { - -re ".*$gdb_prompt$" { pass "go after array init line" } - timeout { fail "go after array init line (timeout)" } +gdb_test_multiple "next" "go after array init line" { + -re "source .*annota1.c.*$gdb_prompt$" { + pass "go after array init line" + } } @@ -184,12 +175,10 @@ gdb_expect { # FIXME: annotate-value-begin and annotate-value-end not tested (the gdb output # command would cause them to be used) # -send_gdb "print my_array\n" -gdb_expect { - -re "\r\n\032\032post-prompt\r\n\r\n\032\032value-history-begin 1 -\r\n.*= \r\n\032\032value-history-value\r\n.\r\n\032\032array-section-begin 0 -\r\n1\r\n\032\032elt\r\n, 2\r\n\032\032elt\r\n, 3\r\n\032\032elt\r\n\r\n\032\032array-section-end\r\n.\r\n\r\n\032\032value-history-end\r\n$gdb_prompt$" \ - { pass "print array" } - -re ".*$gdb_prompt$" { fail "print array" } - timeout { fail "print array (timeout)" } +gdb_test_multiple "print my_array" "print array" { + -re "\r\n\032\032post-prompt\r\n\r\n\032\032value-history-begin 1 -\r\n.*= \r\n\032\032value-history-value\r\n.\r\n\032\032array-section-begin 0 -\r\n1\r\n\032\032elt\r\n, 2\r\n\032\032elt\r\n, 3\r\n\032\032elt\r\n\r\n\032\032array-section-end\r\n.\r\n\r\n\032\032value-history-end\r\n$gdb_prompt$" { + pass "print array" + } } @@ -200,12 +189,10 @@ gdb_expect { # #exp_internal 1 -send_gdb "print non_existent_value\n" -gdb_expect { - -re "\r\n\032\032post-prompt\r\n\r\n\032\032error-begin\r\nNo symbol \"non_existent_value\" in current context.\r\n\r\n\032\032error\r\n$gdb_prompt$" \ - { pass "print non_existent_value" } - -re ".*$gdb_prompt$" { fail "print non_existent_value" } - timeout { fail "print non_existent_value (timeout)" } +gdb_test_multiple "print non_existent_value" "print non_existent_value" { + -re "\r\n\032\032post-prompt\r\n\r\n\032\032error-begin\r\nNo symbol \"non_existent_value\" in current context.\r\n\r\n\032\032error\r\n$gdb_prompt$" { + pass "print non_existent_value" + } } @@ -213,25 +200,22 @@ gdb_expect { # break at signal handler. So that, once we are in the sig handler, if we do a bt # we can test annotate-signal-handler-caller # -send_gdb "break handle_USR1\n" -gdb_expect { - -re "\r\n\032\032post-prompt\r\n\r\n\032\032breakpoints-invalid\r\nBreakpoint.*at $hex: file.*$srcfile, line.*\r\n$gdb_prompt$" \ - { pass "break handle_USR1" } - -re ".*$gdb_prompt$" { fail "break handle_USR1" } - timeout { fail "break handle_USR1 (timeout)" } +gdb_test_multiple "break handle_USR1" "break handle_USR1" { + -re "\r\n\032\032post-prompt\r\n\r\n\032\032breakpoints-invalid\r\nBreakpoint.*at $hex: file.*$srcfile, line.*\r\n$gdb_prompt$" { + pass "break handle_USR1" + } } # # break at printf. When we are stopped at printf, we can test # -send_gdb "break printf\n" -gdb_expect { - -re "\r\n\032\032post-prompt\r\n\r\n\032\032breakpoints-invalid\r\nBreakpoint.*at $hex.*$gdb_prompt$" \ - { pass "break printf" } - -re "\r\n\032\032post-prompt\r\nwarning: Breakpoint address adjusted from $hex to $hex.\r\n\r\n\032\032breakpoints-invalid\r\nBreakpoint.*at $hex.*$gdb_prompt$" \ - { pass "break printf" } - -re ".*$gdb_prompt$" { fail "break printf" } - timeout { fail "break printf (timeout)" } +gdb_test_multiple "break printf" "break printf" { + -re "\r\n\032\032post-prompt\r\n\r\n\032\032breakpoints-invalid\r\nBreakpoint.*at $hex.*$gdb_prompt$" { + pass "break printf" + } + -re "\r\n\032\032post-prompt\r\nwarning: Breakpoint address adjusted from $hex to $hex.\r\n\r\n\032\032breakpoints-invalid\r\nBreakpoint.*at $hex.*$gdb_prompt$" { + pass "break printf" + } } # @@ -255,16 +239,17 @@ gdb_test_multiple "continue" "continue to printf" { # annotate-frame-address-end # set pat_begin "\r\n\032\032post-prompt\r\n\r\n\032\032frame-begin 0 $hex\r\n.0 \r\n(\032\032frame-address\r\n$hex\r\n\032\032frame-address-end\r\n in \r\n)*\032\032frame-function-name\r\n.*printf(@.*)?\r\n\032\032frame-args\r\n \\(.*frame-end\r\n\r\n\032\032frame-begin 1 $hex\r\n.1 \r\n\032\032frame-address\r\n$hex\r\n\032\032frame-address-end\r\n in \r\n\032\032frame-function-name\r\nmain\r\n\032\032frame-args\r\n \\(\\)\r\n\032\032frame-source-begin\r\n at \r\n\032\032frame-source-file\r\n" + set pat_end "\r\n\032\032frame-source-file-end\r\n:\r\n\032\032frame-source-line\r\n.*\r\n\032\032frame-source-end\r\n\r\n\r\n\032\032frame-end\r\n(\r\n\032\032frame-begin .*\r\n\r\n\032\032frame-end\r\n)*$gdb_prompt$" -send_gdb "backtrace\n" -gdb_expect { - -re "$pat_begin$escapedsrcfile$pat_end" - { pass "backtrace from shlibrary" } - -re "$pat_begin.*$srcfile$pat_end" - { setup_xfail "*-*-*" 1270 - fail "backtrace from shlibrary" } - -re ".*$gdb_prompt$" { fail "backtrace from shlibrary" } - timeout { fail "backtrace from shlibrary (timeout)" } + +gdb_test_multiple "backtrace" "backtrace from shlibrary" { + -re "$pat_begin$escapedsrcfile$pat_end" { + pass "backtrace from shlibrary" + } + -re "$pat_begin.*$srcfile$pat_end" { + setup_xfail "*-*-*" 1270 + fail "backtrace from shlibrary" + } } @@ -280,71 +265,60 @@ if [target_info exists gdb,nosignals] { unsupported "send SIGUSR1" unsupported "backtrace @ signal handler" } else { - send_gdb "signal SIGUSR1\n" - gdb_expect { - -re "\r\n\032\032post-prompt\r\nContinuing with signal SIGUSR1.\r\n\r\n\032\032starting\(\r\n\r\n\032\032frames-invalid\)+\r\n\r\n\032\032breakpoint 2\r\n\r\nBreakpoint 2, \r\n\032\032frame-begin 0 $hex\r\n\r\n\032\032frame-function-name\r\nhandle_USR1\r\n\032\032frame-args\r\n \\(\r\n\032\032arg-begin\r\nsig\r\n\032\032arg-name-end\r\n=\r\n\032\032arg-value -\r\n$decimal\r\n\032\032arg-end\r\n\\)\r\n\032\032frame-source-begin\r\n at \r\n\032\032frame-source-file\r\n${escapedsrcfile}\r\n\032\032frame-source-file-end\r\n:\r\n\032\032frame-source-line\r\n.*\r\n\032\032frame-source-end\r\n\r\n\r\n\032\032source.*annota1.c:.*:.*:beg:$hex\r\n\r\n\032\032frame-end\r\n\r\n\032\032stopped\r\n$gdb_prompt$" \ - { pass "send SIGUSR1" } - -re "\r\n\032\032post-prompt\r\nContinuing with signal SIGUSR1.\r\n\r\n\032\032starting\(\r\n\r\n\032\032frames-invalid\)+\r\n\r\n\032\032breakpoint 2\r\n\r\nBreakpoint 2, \r\n\032\032frame-begin 0 $hex\r\n\r\n\032\032frame-function-name\r\nhandle_USR1\r\n\032\032frame-args\r\n \\(\r\n\032\032arg-begin\r\nsig\r\n\032\032arg-name-end\r\n=\r\n\032\032arg-value -\r\n$decimal\r\n\032\032arg-end\r\n\\)\r\n\032\032frame-source-begin\r\n at \r\n\032\032frame-source-file\r\n.*${srcfile}\r\n\032\032frame-source-file-end\r\n:\r\n\032\032frame-source-line\r\n.*\r\n\032\032frame-source-end\r\n\r\n\r\n\032\032source.*annota1.c:.*:.*:beg:$hex\r\n\r\n\032\032frame-end\r\n\r\n\032\032stopped\r\n$gdb_prompt$" \ - { setup_xfail "*-*-*" 1270 - fail "send SIGUSR1" } - -re ".*$gdb_prompt$" { fail "send SIGUSR1" } - timeout { fail "send SIGUSR1 (timeout)" } + gdb_test_multiple "signal SIGUSR1" "send SIGUSR1" { + -re "\r\n\032\032post-prompt\r\nContinuing with signal SIGUSR1.\r\n\r\n\032\032starting\(\r\n\r\n\032\032frames-invalid\)+\r\n\r\n\032\032breakpoint 2\r\n\r\nBreakpoint 2, \r\n\032\032frame-begin 0 $hex\r\n\r\n\032\032frame-function-name\r\nhandle_USR1\r\n\032\032frame-args\r\n \\(\r\n\032\032arg-begin\r\nsig\r\n\032\032arg-name-end\r\n=\r\n\032\032arg-value -\r\n$decimal\r\n\032\032arg-end\r\n\\)\r\n\032\032frame-source-begin\r\n at \r\n\032\032frame-source-file\r\n${escapedsrcfile}\r\n\032\032frame-source-file-end\r\n:\r\n\032\032frame-source-line\r\n.*\r\n\032\032frame-source-end\r\n\r\n\r\n\032\032source.*annota1.c:.*:.*:beg:$hex\r\n\r\n\032\032frame-end\r\n\r\n\032\032stopped\r\n$gdb_prompt$" { + pass "send SIGUSR1" + } + -re "\r\n\032\032post-prompt\r\nContinuing with signal SIGUSR1.\r\n\r\n\032\032starting\(\r\n\r\n\032\032frames-invalid\)+\r\n\r\n\032\032breakpoint 2\r\n\r\nBreakpoint 2, \r\n\032\032frame-begin 0 $hex\r\n\r\n\032\032frame-function-name\r\nhandle_USR1\r\n\032\032frame-args\r\n \\(\r\n\032\032arg-begin\r\nsig\r\n\032\032arg-name-end\r\n=\r\n\032\032arg-value -\r\n$decimal\r\n\032\032arg-end\r\n\\)\r\n\032\032frame-source-begin\r\n at \r\n\032\032frame-source-file\r\n.*${srcfile}\r\n\032\032frame-source-file-end\r\n:\r\n\032\032frame-source-line\r\n.*\r\n\032\032frame-source-end\r\n\r\n\r\n\032\032source.*annota1.c:.*:.*:beg:$hex\r\n\r\n\032\032frame-end\r\n\r\n\032\032stopped\r\n$gdb_prompt$" { + setup_xfail "*-*-*" 1270 + fail "send SIGUSR1" + } } # # test: # annotate-signal-handler-caller # - send_gdb "backtrace\n" - gdb_expect { + gdb_test_multiple "backtrace" "backtrace @ signal handler" { -re "frame-begin 0 $hex\r\n#0.*frame-end.*frame-begin 1 $hex\r\n#1.*(\032\032signal-handler-caller\r\n.signal handler called.\r\n\r\n)+\032\032frame-end\r\n\r\n\032\032frame-begin 2 $hex\r\n#2.*(frame-begin 3 $hex\r\n#3.*)*frame-end.*$gdb_prompt$" { pass "backtrace @ signal handler" } - -re ".*$gdb_prompt$" { fail "backtrace @ signal handler" } - timeout { fail "backtrace @ signal handler (timeout)" } } } # # delete all the breakpoints # -send_gdb "delete 1\n" -gdb_expect { - -re "\r\n\032\032post-prompt\r\n$gdb_prompt$" \ - { pass "delete bp 1" } - -re ".*$gdb_prompt$" { fail "delete bp 1" } - timeout { fail "delete bp 1 (timeout)" } +gdb_test_multiple "delete 1" "delete bp 1" { + -re "\r\n\032\032post-prompt\r\n$gdb_prompt$" { + pass "delete bp 1" + } } -send_gdb "delete 2\n" -gdb_expect { - -re "\r\n\032\032post-prompt\r\n$gdb_prompt$" \ - { pass "delete bp 2" } - -re ".*$gdb_prompt$" { fail "delete bp 2 " } - timeout { fail "delete bp 2 (timeout)" } +gdb_test_multiple "delete 2" "delete bp 2" { + -re "\r\n\032\032post-prompt\r\n$gdb_prompt$" { + pass "delete bp 2" + } } -send_gdb "delete 3\n" -gdb_expect { - -re "\r\n\032\032post-prompt\r\n$gdb_prompt$" \ - { pass "delete bp 3" } - -re ".*$gdb_prompt$" { fail "delete bp 3" } - timeout { fail "delete bp 3 (timeout)" } +gdb_test_multiple "delete 3" "delete bp 3" { + -re "\r\n\032\032post-prompt\r\n$gdb_prompt$" { + pass "delete bp 3" + } } # # break at main, after value is initialized. This is in preparation # to test the annotate output for the display command. # -send_gdb "break main\n" -gdb_expect { - -re "post-prompt.*\032\032breakpoints-invalid.*Breakpoint 4 at $hex: file ${escapedsrcfile}, line $main_line.*$gdb_prompt$" \ - { pass "break at 28" } - -re "post-prompt.*\032\032breakpoints-invalid.*Breakpoint 4 at $hex: file .*${srcfile}, line $main_line.*$gdb_prompt$" \ - { setup_xfail "*-*-*" 1270 - fail "break at 28" } - -re ".*$gdb_prompt$" { fail "break at 28" } - timeout { fail "break at 28 (timeout)" } +gdb_test_multiple "break main" "break at 28" { + -re "post-prompt.*\032\032breakpoints-invalid.*Breakpoint 4 at $hex: file ${escapedsrcfile}, line $main_line.*$gdb_prompt$" { + pass "break at 28" + } + -re "post-prompt.*\032\032breakpoints-invalid.*Breakpoint 4 at $hex: file .*${srcfile}, line $main_line.*$gdb_prompt$" { + setup_xfail "*-*-*" 1270 + fail "break at 28" + } } # @@ -357,12 +331,10 @@ gdb_expect { # annotate-display-end # FIXME: annotate-display-value not tested # -send_gdb "display value\n" -gdb_expect { - -re "post-prompt\r\n\r\n\032\032display-begin\r\n1\r\n\032\032display-number-end\r\n: \r\n\032\032display-format\r\n\r\n\032\032display-expression\r\nvalue\r\n\032\032display-expression-end\r\n = \r\n\032\032display-expression\r\n7\r\n\r\n\032\032display-end\r\n$gdb_prompt$" \ - { pass "set up display" } - -re ".*$gdb_prompt$" { fail "set up display" } - timeout { fail "set up display (timeout)" } +gdb_test_multiple "display value" "set up display" { + -re "post-prompt\r\n\r\n\032\032display-begin\r\n1\r\n\032\032display-number-end\r\n: \r\n\032\032display-format\r\n\r\n\032\032display-expression\r\nvalue\r\n\032\032display-expression-end\r\n = \r\n\032\032display-expression\r\n7\r\n\r\n\032\032display-end\r\n$gdb_prompt$" { + pass "set up display" + } } @@ -388,49 +360,36 @@ gdb_expect { # Test that breakpoints-invalid is issued once and only once for # breakpoint ignore count changes, after annotation stopped. # -send_gdb "break 46\n" -gdb_expect { +gdb_test_multiple "break 46" "break at 46" { -re "Breakpoint 5 at $hex: file .*$srcfile, line 46.*$gdb_prompt$" { pass "break at 46" } - -re ".*$gdb_prompt$" { fail "break at 46" } - timeout { fail "break at 46 (timeout)" } } -send_gdb "ignore 5 4\n" -gdb_expect { +gdb_test_multiple "ignore 5 4" "ignore 5 4" { -re "Will ignore next 4 crossings of breakpoint 5.*$gdb_prompt$" { pass "ignore 5 4" } - -re ".*$gdb_prompt$" { fail "ignore 5 4" } - timeout { fail "ignore 5 4 (timeout)" } } -send_gdb "continue\n" -gdb_expect { +gdb_test_multiple "continue" "annotate ignore count change" { -re ".*$srcfile:46:.*\032\032stopped\r\n\r\n\032\032breakpoints-invalid\r\n$gdb_prompt$" { pass "annotate ignore count change" } - -re ".*$gdb_prompt$" { fail "annotate ignore count change" } - timeout { fail "annotate ignore count change (timeout)" } } # check that ignore command is working, or the above can provide # misleading assurance ... -send_gdb "next\n" -gdb_expect { - -re "$gdb_prompt$" {} - timeout { fail "next to exit loop" } +gdb_test_multiple "next" "next to exit loop" { + -re "source .*annota1.c.*$gdb_prompt$" { + } } -send_gdb "next\n" -gdb_expect { +gdb_test_multiple "next" "breakpoint ignore count" { -re ".*$srcfile:49:.*$gdb_prompt$" { pass "breakpoint ignore count" } - -re ".*$gdb_prompt$" { fail "breakpoint ignore count" } - timeout { fail "breakpoint ignore count (timeout)" } } # @@ -456,12 +415,10 @@ if [target_info exists gdb,nosignals] { unsupported "signal sent" } else { setup_xfail hppa*-*-hpux11* - send_gdb "signal SIGTRAP\n" - gdb_expect { - -re ".*\032\032post-prompt\r\nContinuing with signal SIGTRAP.\r\n\r\n\032\032starting\(\r\n\r\n\032\032frames-invalid\)+\r\n\r\n\032\032signalled\r\n\r\nProgram terminated with signal \r\n\032\032signal-name\r\nSIGTRAP\r\n\032\032signal-name-end\r\n, \r\n\032\032signal-string\r\nTrace.breakpoint trap\r\n\032\032signal-string-end\r\n.\r\nThe program no longer exists.\r\n\r\n\032\032stopped\r\n$gdb_prompt$" \ - { pass "signal sent" } - -re ".*$gdb_prompt$" { fail "signal sent" } - timeout { fail "signal sent (timeout)" } + gdb_test_multiple "signal SIGTRAP" "signal sent" { + -re ".*\032\032post-prompt\r\nContinuing with signal SIGTRAP.\r\n\r\n\032\032starting\(\r\n\r\n\032\032frames-invalid\)+\r\n\r\n\032\032signalled\r\n\r\nProgram terminated with signal \r\n\032\032signal-name\r\nSIGTRAP\r\n\032\032signal-name-end\r\n, \r\n\032\032signal-string\r\nTrace.breakpoint trap\r\n\032\032signal-string-end\r\n.\r\nThe program no longer exists.\r\n\r\n\032\032stopped\r\n$gdb_prompt$" { + pass "signal sent" + } } } @@ -503,29 +460,25 @@ proc thread_test {} { set gdb_prompt \ "\r\n\032\032pre-prompt\r\n$gdb_prompt \r\n\032\032prompt\r\n" - send_gdb "set annotate 2\n" - gdb_expect { - -re "set annotate 2\r\n$gdb_prompt$" {} + gdb_test_multiple "set annotate 2" "" { + -re "set annotate 2\r\n$gdb_prompt$" { + } } - send_gdb "next 2\n" - gdb_expect { + gdb_test_multiple "next 2" "new thread" { -re ".*\032\032new-thread" { - pass "new thread" + pass "new thread" } - timeout { fail "new thread (timeout)" } } } } proc thread_switch {} { - send_gdb "thread 1\n" - gdb_expect { - -re ".*\032\032thread-changed" { + gdb_test_multiple "thread 1" "thread switch" { + -re ".*\032\032thread-changed" { pass "thread switch" - } - timeout { fail "thread switch (timeout)" } } + } } thread_test |