Merge GDB 7.5.1

gdb/testsuite/gdb.base/commands.exp

 #   Copyright 1988, 1990-1992, 1994-1995, 1997-2003, 2005-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/>.
 
-if $tracelevel then {
-    strace $tracelevel
-}
-
 #
 # test special commands (if, while, etc)
 #
 
 if { [prepare_for_testing commands.exp commands run.c {debug additional_flags=-DFAKEARGV}] } {
     return -1
 }
 
 proc gdbvar_simple_if_test {} {
     global gdb_prompt
@@ skipping 280 matching lines @@
         "end commands on watch"
 
     set test "continue with watch"
     gdb_test_multiple "continue" "$test" {
         -re "No symbol \"value\" in current context.\r\n$gdb_prompt $" {
             # Happens if GDB actually runs the watchpoints commands,
             # even though the watchpoint was deleted for not being in
             # scope.
             fail $test
         }
-        -re "Continuing.*\[Ww\]atchpoint $wp_id deleted because the program has left the block in.*which its expression is valid.*run.c:(57|82).*$gdb_prompt $" {
+        -re "Continuing.*\[Ww\]atchpoint $wp_id deleted because the program has left the block in.*which its expression is valid.*run.c:(53|77).*$gdb_prompt $" {
             pass $test
         }
    }
 }
 
 proc test_command_prompt_position {} {
     global gdb_prompt
 
     if [target_info exists noargs] { 
         verbose "Skipping test_command_prompt_position because of noargs."
@@ skipping 490 matching lines @@
 bp_deleted_in_command_test
 temporary_breakpoint_commands
 stray_arg0_test
 source_file_with_indented_comment
 recursive_source_test
 if_commands_test
 error_clears_commands_left
 redefine_hook_test
 # This one should come last, as it redefines "backtrace".
 redefine_backtrace_test