Merge GDB 7.5.1

gdb/testsuite/gdb.base/annota1.exp

 # Copyright 1999-2012 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 Elena Zannoni (ezannoni@cygnus.com)
 
-if $tracelevel then {
-    strace $tracelevel
-}
-
 
 # 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 [is_remote target] then {
     return 0
 }
 
@@ skipping 10 matching lines @@
     untested annota1.exp
     return -1
 }
 
 
 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 32
-
 # The commands we test here produce many lines of output; disable "press 
 # <return> to continue" prompts.
 gdb_test_no_output "set height 0"
 
 #
 # break at main
 #
+
+set main_line [gdb_get_line_number "break main"]
+
 gdb_test "break main" \
-    "Breakpoint.*at.* file .*$srcfile, line.*" \
+    "Breakpoint.*at.* file .*$srcfile, line $main_line\\." \
     "breakpoint main"
 
 
 #
 # NOTE: this prompt is OK only when the annotation level is > 1
 # NOTE: When this prompt is in use the gdb_test procedure cannot be used because
 # it assumes that the last char after the gdb_prompt is a white space. This is not
 # true with this annotated prompt. So we must use send_gdb and gdb_expect.
 #
 
@@ skipping 56 matching lines @@
 # annotate-frame-source-file-end
 # annotate-frame-source-line
 # annotate-frame-source-end
 # annotate-source
 # annotate-frame-end
 # annotate-stopped
 #
 #exp_internal 1
 set binexp [string_to_regexp $binfile]
 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$" {
+    -re "\r\n\032\032post-prompt\r\nStarting program: $binexp \(\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\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" 
     }
 }
 #exp_internal 0
 #exit 0
 
 #
 # Let's do a next, to get to a point where the array is initialized
 # We don't care about the annotated output for this operation, it is the same as
 # the one produced by run above
@@ skipping 146 matching lines @@
 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.
 #
-gdb_test_multiple "break main" "break at 28" {
+gdb_test_multiple "break main" "break at main" {
     -re "post-prompt.*\032\032breakpoints-invalid.*Breakpoint 4 at $hex: file ${escapedsrcfile}, line $main_line.*$gdb_prompt$" {
-        pass "break at 28"
+        pass "break at main"
     }
     -re "post-prompt.*\032\032breakpoints-invalid.*Breakpoint 4 at $hex: file .*${srcfile}, line $main_line.*$gdb_prompt$" {
         setup_xfail "*-*-*" 1270
-        fail "break at 28"
+        fail "break at main"
     }
 }
 
 #
 # display the value; test:
 # annotate-display-begin
 # annotate-display-number-end
 # annotate-display-format
 # annotate-display-expression
 # annotate-display-expression-end
@@ skipping 22 matching lines @@
          }
      }
   -re ".*$gdb_prompt$"  { fail "re-run" }
   timeout { fail "re-run (timeout)" }
 }
 
 #
 # Test that breakpoints-invalid is issued once and only once for
 # breakpoint ignore count changes, after annotation stopped.
 #
-gdb_test_multiple "break 46" "break at 46" {
-    -re "Breakpoint 5 at $hex: file .*$srcfile, line 46.*$gdb_prompt$" {
-        pass "break at 46"
+
+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 ".*$srcfile:46:.*\032\032stopped\r\n\r\n\032\032breakpoints-invalid\r\n$gdb_prompt$" {
+    -re ".*$srcfile:$value_inc_line:.*\032\032stopped\r\n\r\n\032\032breakpoints-invalid\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:49:.*$gdb_prompt$" {
+    -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$" {
@@ skipping 45 matching lines @@
     pass "$test (not dumped)"
 }
 
 proc thread_test {} {
     global objdir subdir srcdir testfile
     global gdb_prompt old_gdb_prompt
     set srcfile watch_thread_num.c
     set binfile ${objdir}/${subdir}/${testfile}-watch_thread_num
     set gdb_prompt $old_gdb_prompt
 
-    if { ![get_compiler_info ${binfile}] && [gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] == "" } {
+    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
         }
 
@@ skipping 20 matching lines @@
         }
     }
 }
 
 thread_test
 thread_switch
 
 # restore the original prompt for the rest of the testsuite
 
 set gdb_prompt $old_gdb_prompt