]> git.ipfire.org Git - thirdparty/binutils-gdb.git/blobdiff - gdb/testsuite/gdb.base/annota1.exp
gdb: Don't allow annotations to influence what else GDB prints
[thirdparty/binutils-gdb.git] / gdb / testsuite / gdb.base / annota1.exp
index 4239822c659877d1964204ff4a61460efc64d08e..3d379f0fd497210cd31d87b45623ab98e5d713a8 100644 (file)
@@ -1,79 +1,56 @@
-#   Copyright (C) 1999
-#   Free Software Foundation, Inc.
+# Copyright 1999-2019 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 2 of the License, or
+# 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
-
-# Please email any bugs, comments, and/or additions to this file to:
-# bug-gdb@prep.ai.mit.edu
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # This file was written by Elena Zannoni (ezannoni@cygnus.com)
 
-if $tracelevel then {
-    strace $tracelevel
+
+# This testcase cannot use runto_main because of the different prompt
+# we get when using annotation level 2.
+#
+if ![target_can_use_run_cmd] {
+    return 0
 }
 
+set breakpoints_invalid "\r\n\032\032breakpoints-invalid\r\n"
 
 #
 # test running programs
 #
-set prms_id 0
-set bug_id 0
 
-set testfile "annota1"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile .c
 
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-w}] != "" } {
-    gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
+if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
+    untested "failed to compile"
+    return -1
 }
 
 
-# are we on a target board? If so, don't run these tests.
-# note: this is necessary because we cannot use runto_main (which would
-# work for remote targets too) because of the different prompt we get
-# when using annotation level 2.
-#
-if ![isnative] then {
-    return 0
-}
-
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
-if [target_info exists gdb_stub] {
-    gdb_step_for_stub;
-}
-
-#
-# the line at which break main will put the breakpoint
-#
-set main_line 20
+clean_restart ${binfile}
 
 # 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
+# break in main
 #
-gdb_test "break main" \
-    "Breakpoint.*at.* file .*$srcfile, line.*" \
+
+set main_line [gdb_get_line_number "break main"]
+
+gdb_test "break ${srcfile}:${main_line}" \
+    "Breakpoint.*at.* file .*$srcfile, line $main_line\\." \
     "breakpoint main"
 
 
@@ -87,6 +64,11 @@ gdb_test "break main" \
 set old_gdb_prompt $gdb_prompt
 set gdb_prompt "\r\n\032\032pre-prompt\r\n$gdb_prompt \r\n\032\032prompt\r\n"
 
+#
+# Escape all the characters in the path that need it. For instance 
+# the directory name could contain '+'.
+#
+set escapedsrcfile [string_to_regexp ${srcdir}/${subdir}/${srcfile}]
 
 
 #
@@ -113,12 +95,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 ${srcdir}/${subdir}/${srcfile}:$main_line\r\n\r\n\032\032breakpoints-table-end\r\n$gdb_prompt$" \
-       {pass "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"
+    }
 }
 
 
@@ -141,13 +125,31 @@ gdb_expect {
 # annotate-stopped
 #
 #exp_internal 1
-send_gdb "run\n"
-  gdb_expect {
-    -re "\r\n\032\032post-prompt\r\nStarting program: $binfile \(\r\n\r\n\032\032frames-invalid\)+\(\r\n\r\n\032\032breakpoints-invalid\)*.*\(\r\n\r\n\032\032frames-invalid\)*\r\n\r\n\032\032starting\(\r\n\r\n\032\032frames-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\r\n$gdb_prompt$" \
-                           { pass "run until main breakpoint" }
-    -re ".*$gdb_prompt$"       { fail "run until main breakpoint" }
-    timeout                { fail "run until main breakpoint (timeout)" }
-  }
+set binexp [string_to_regexp $binfile]
+gdb_test_multiple "run" "run until main breakpoint" {
+    -re [join { "\r\n\032\032post-prompt\r\nStarting program: $binexp " \
+                   "\(\(\r\nReading \[^\r\n\]+\)|\(\r\nwarning: File transfers from remote targets can be slow\[^\r\n\]+\)\)*" \
+                   "\(\r\nwarning: Skipping \[^\r\n\]+ .gdb_index section in \[^\r\n\]+\r\nDo \"set use-deprecated-index-sections on\" before the file is read\r\nto use the section anyway\\.\)?" \
+                   "\(\(\r\n\r\n\032\032frames-invalid\)|\(\r\n\r\n\032\032breakpoints-invalid\)\)*\r\n\r\n" \
+                   "\032\032starting\(\(\r\nReading \[^\r\n\]+\)|\(\r\nwarning: File transfers from remote targets can be slow\[^\r\n\]+\)\)*" \
+                   "\(\(\r\n\r\n\032\032frames-invalid\)|\(\r\n\r\n\032\032breakpoints-invalid\)\)*\r\n\r\n" \
+                   "\032\032breakpoint 1\r\n\r\n" \
+                   "Breakpoint 1, \r\n" \
+                   "\032\032frame-begin 0 $hex\r\n\r\n" \
+                   "\032\032frame-function-name\r\n" \
+                   "main\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"
+    }
+}
 #exp_internal 0
 #exit 0
 
@@ -156,10 +158,10 @@ send_gdb "run\n"
 # 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"
+    }
 }
 
 
@@ -175,12 +177,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"
+    }
 }
 
 
@@ -191,12 +191,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"
+    }
 }
 
 
@@ -204,34 +202,36 @@ 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 "breakpoint handle_USR1" }
-  -re ".*$gdb_prompt$"     { fail "break at handle_USR1" }
-  timeout                  { fail "break at handle_USR1 (timeout)" }
+gdb_test_multiple "break handle_USR1" "break handle_USR1" {
+    -re  "\r\n\032\032post-prompt\r\nBreakpoint.*at $hex: file.*$srcfile, line.*\r\n\032\032breakpoints-invalid\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 "breakpoint 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\nBreakpoint.*at $hex.*\032\032breakpoints-invalid\r\n.*$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"
+    }
 }
 
 #
 # get to printf
 #
-send_gdb "continue\n"
-gdb_expect {
-  -re "\r\n\032\032post-prompt\r\nContinuing.\r\n\r\n\032\032starting\r\n\r\n\032\032frames-invalid\r\n\r\n\032\032breakpoint 3\r\n\r\nBreakpoint 3, \r\n\032\032frame-begin 0 $hex\r\n\r\n\032\032frame-address\r\n$hex\r\n\032\032frame-address-end\r\n in \r\n\032\032frame-function-name\r\nprintf\r\n\032\032frame-args\r\n \\(\\)\r\n\032\032frame-where\r\n from.*\032\032frame-end\r\n\r\n\032\032stopped\r\n$gdb_prompt$" \
-         { pass "continue to printf" }
-  -re ".*$gdb_prompt$"     { fail "continue to printf" }
-  timeout                  { fail "continue to printf (timeout)" }
+set pat_begin "\r\n\032\032post-prompt\r\nContinuing.\r\n\r\n\032\032starting\r\n\r\n\032\032frames-invalid\r\n${breakpoints_invalid}"
+set pat_adjust "warning: Breakpoint 3 address previously adjusted from $hex to $hex.\r\n"
+set pat_end "\r\n\032\032breakpoint 3\r\n\r\nBreakpoint 3, \r\n\032\032frame-begin 0 $hex\r\n\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.*\032\032frame-end\r\n\r\n\032\032stopped\r\n$gdb_prompt$"
+
+gdb_test_multiple "continue" "continue to printf" {
+    -re "${pat_begin}($pat_adjust)?$pat_end" {
+       pass "continue to printf"
+    }
+    -re ".*$gdb_prompt$"     { fail "continue to printf" }
 }
 
 #
@@ -240,12 +240,18 @@ gdb_expect {
 # annotate-frame-address
 # annotate-frame-address-end
 #
-send_gdb "backtrace\n"
-gdb_expect {
-  -re "\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\nprintf\r\n\032\032frame-args\r\n \\(\\)\r\n\032\032frame-where\r\n from.*\r\n\032\032frame-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${srcdir}/${subdir}/${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\032frame-end\r\n$gdb_prompt$" \
-         { pass "bactrace from shlibrary" }
-  -re ".*$gdb_prompt$"     { fail "backtrace from shlibrary" }
-  timeout                  { fail "backtrace from shlibrary (timeout)" }
+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$"
+
+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"
+    }
 }
 
 
@@ -256,70 +262,66 @@ gdb_expect {
 # annotate-arg-value
 # annotate-arg-end
 #
-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${srcdir}/${subdir}/${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:.*:185:beg:$hex\r\n\r\n\032\032frame-end\r\n\r\n\032\032stopped\r\n$gdb_prompt$" \
-       { pass "send SIGUSR1" }
-  -re ".*$gdb_prompt$"     { fail "send SIGUSR1" }
-  timeout                  { fail "send SIGUSR1 (timeout)" }
-}
-
 
-#
-# test:
-# annotate-signal-handler-caller
-#
-verbose "match_max local is: [match_max]"
-verbose "match_max default is: [match_max -d]"
-# This is necessary because a 2000 buffer is not enought to get everything
-# up to the prompt ad the test gets a timeout.
-match_max 3000
-verbose "match_max now is: [match_max]"
-send_gdb "backtrace\n"
-gdb_expect {
-  -re ".*frame-begin 0 $hex.*0.*frame-end.*frame-begin 1 $hex.*1.*\032\032signal-handler-caller\r\n.signal handler called.\r\n\r\n\032\032frame-end\r\n\r\n.*frame-begin 2 $hex.*2.*frame-begin 3 $hex.*3.*frame-end.*$gdb_prompt$" \
-       { pass "backtrace @ signal handler" }
-  -re ".*$gdb_prompt$"     { fail "backtrace @ signal handler" }
-  timeout                  { fail "backtrace @ signal handler (timeout)" }
+if [target_info exists gdb,nosignals] {
+    unsupported "send SIGUSR1"
+    unsupported "backtrace @ signal handler"
+} else {
+    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\032breakpoints-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$decimal\[^\r\n\]+\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\032breakpoints-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$decimal\[^\r\n\]+\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
+    #
+    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"
+       }
+    }
 }
 
 #
 # 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${breakpoints_invalid}$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${breakpoints_invalid}$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${breakpoints_invalid}$gdb_prompt$" {
+       pass "delete bp 3"
+    }
 }
 
 #
-# break at main, after value is initialized. This is in preparation
+# break in 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 ${srcdir}/${subdir}/${srcfile}, line $main_line.*$gdb_prompt$" \
-            { pass "break at 28" }
-     -re ".*$gdb_prompt$"  { fail "break at 28" }
-     timeout { fail "break at 28 (timeout)" }
+set test "break in main"
+gdb_test_multiple "break ${srcfile}:${main_line}" $test {
+    -re "post-prompt.*Breakpoint 4 at $hex: file ${escapedsrcfile}, line $main_line.*\032\032breakpoints-invalid.*$gdb_prompt$" {
+       pass $test
+    }
+    -re "post-prompt.*Breakpoint 4 at $hex: file .*${srcfile}, line $main_line.*\032\032breakpoints-invalid.*$gdb_prompt$" {
+       setup_xfail "*-*-*" 1270
+       fail $test
+    }
 }
 
 #
@@ -332,12 +334,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"
+    }
 }
 
 
@@ -359,6 +359,60 @@ gdb_expect {
   timeout { fail "re-run (timeout)" }
 }
 
+#
+# Test that breakpoints-invalid is issued once and only once for
+# breakpoint ignore count changes, after annotation stopped.
+#
+
+set value_inc_line [gdb_get_line_number "increment value"]
+
+gdb_test_multiple "break $value_inc_line" "break at value++" {
+    -re "Breakpoint 5 at $hex: file .*$srcfile, line $value_inc_line.*$gdb_prompt$" {
+       pass "break at value++"
+    }
+}
+
+gdb_test_multiple "ignore 5 4" "ignore 5 4" {
+    -re "Will ignore next 4 crossings of breakpoint 5.*$gdb_prompt$" {
+       pass "ignore 5 4"
+    }
+}
+
+gdb_test_multiple "continue" "annotate ignore count change" {
+    -re ".*breakpoints-invalid.*breakpoints-invalid.*$gdb_prompt$" {
+       fail "annotate ignore count change"
+    }
+    -re ".*$srcfile:$value_inc_line:.*\032\032stopped\r\n$gdb_prompt$" {
+       pass "annotate ignore count change"
+    }
+}
+
+# check that ignore command is working, or the above can provide
+# misleading assurance ...
+
+gdb_test_multiple "next" "next to exit loop" {
+    -re "source .*annota1.c.*$gdb_prompt$" {
+    }
+}
+
+set after_loop_line [gdb_get_line_number "after loop"]
+
+gdb_test_multiple "next" "breakpoint ignore count" {
+    -re ".*$srcfile:$after_loop_line:.*$gdb_prompt$" {
+       pass "breakpoint ignore count"
+    }
+}
+
+# Get the inferior's PID for later.
+
+set test "get inferior pid"
+set pid -1
+gdb_test_multiple "info inferior 1" "$test" {
+    -re "process (\[0-9\]*).*$gdb_prompt$" {
+       set pid $expect_out(1,string)
+       pass "$test"
+    }
+}
 
 #
 # Send a signal that is not handled; test:
@@ -369,32 +423,87 @@ gdb_expect {
 # annotate-signal-string-end
 # FIXME: annotate-signal not tested (requires that the inferior be 
 #                        stopped by a "random" signal)
-#
-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\n\032\032frames-invalid\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)" }
+
+if [target_info exists gdb,nosignals] {
+    unsupported "signal sent"
+} else {
+    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\032thread-exited,id=\"${decimal}\",group-id=\"i${decimal}\"\r\n\r\n\032\032stopped\r\n$gdb_prompt$" {
+           pass "signal sent"
+       }
+    }
 }
 
+# Check for production of a core file and remove it!
 
-# Check for production of a core file
-# and remove it!
+set test "cleanup core file"
+if { [remote_file host exists core] } {
+    remote_file host delete core
+    pass "$test (removed)"
+} elseif { $pid != -1 && [remote_file host exists core.$pid] } {
+    remote_file host delete core.$pid
+    pass "$test (removed)"
+} else {
+    pass "$test (not dumped)"
+}
 
-set exec_output [remote_exec build "ls core"]
+proc thread_test {} {
+    global subdir srcdir testfile srcfile binfile
+    global gdb_prompt old_gdb_prompt
+    global decimal
+    set srcfile watch_thread_num.c
+    set binfile [standard_output_file ${testfile}-watch_thread_num]
+    set gdb_prompt $old_gdb_prompt
+
+    if { ![get_compiler_info] && [gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] == "" } {
+
+       gdb_exit
+       gdb_start
+       gdb_reinitialize_dir $srcdir/$subdir
+       gdb_load ${binfile}
+       if { ![runto main] } then {
+           fail "run to main"
+           return
+       }
+
+       set linenum [gdb_get_line_number "all threads started"]
+       gdb_breakpoint "$linenum"
+
+       set linenum [gdb_get_line_number "first child thread exited"]
+       gdb_breakpoint "$linenum"
+
+       set gdb_prompt \
+           "\r\n\032\032pre-prompt\r\n$gdb_prompt \r\n\032\032prompt\r\n"
+
+       gdb_test_multiple "set annotate 2" "" {
+           -re "set annotate 2\r\n$gdb_prompt$" {
+           }
+       }
+
+       gdb_test_multiple "continue" "new thread" {
+           -re "\032\032new-thread.*\r\n$gdb_prompt$" {
+               pass "new thread"
+           }
+       }
+
+    gdb_test_multiple "continue" "thread exit" {
+           -re "\032\032thread-exited,id=\"${decimal}\",group-id=\"i${decimal}\".*\r\n$gdb_prompt$" {
+               pass "thread exit"
+           }
+    }
+    }
+}
 
-if [ regexp "core not found" $exec_output]  {
-    pass "No core dumped"
-} else {
-  if [ regexp "No such file or directory" $exec_output] {
-      pass "No core dumped"
-  } else {
-      remote_exec build "rm -f core"
-      pass "Core dumped and removed"
-  }
+proc thread_switch {} {
+    gdb_test_multiple "thread 1" "thread switch" {
+       -re ".*\032\032thread-changed" {
+           pass "thread switch"
+       }
+    }
 }
 
+thread_test
+thread_switch
 
 # restore the original prompt for the rest of the testsuite