Merge GDB 7.5.1

gdb/testsuite/gdb.ada/watch_arg.exp

 # Copyright 2006-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
-}
-
 load_lib "ada.exp"
 
 if { [skip_ada_tests] } { return -1 }
 
 set testdir "watch_arg"
 set testfile "${testdir}/watch"
 set srcfile ${srcdir}/${subdir}/${testfile}.adb
 set binfile ${objdir}/${subdir}/${testfile}
 
 file mkdir ${objdir}/${subdir}/${testdir}
@@ skipping 19 matching lines @@
          "insert second breakpoint in watch.adb"
 
 # Then continue to that breakpoint, and verify that the watchpoint
 # did not interfere with that.
 
 gdb_test "cont" \
          "Breakpoint \[0-9\]+, watch \\(\\).*" \
          "Continuing to second breakpoint"