Merge GDB 7.5.1

gdb/testsuite/gdb.base/trace-commands.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/>.
 
 # Test that the source command's verbose mode works, the 'set trace-commands'
 # command works, and that the nest depth is correct in various circumstances.
 
-if $tracelevel then {
-    strace $tracelevel
-}
-
 gdb_exit
 gdb_start
 
 # Create a file to source
 set fd [open "tracecommandsscript" w]
 puts $fd "\
 echo in tracecommandsscript\\n
 define func
  echo in func \$arg0\\n
 end
@@ skipping 84 matching lines @@
 gdb_test_sequence "if 1\nif 2\nload\necho should not get here\\n\nend\nend" \
     "depth resets on error part 1" {
   {[\r\n]\+if 1}
   {[\r\n]\+\+if 2}
   {[\r\n]\+\+\+load}
   {[\r\n]No executable file specified\.}
   {[\r\n]Use the "file" or "exec-file" command\.}
 }
 gdb_test "echo hi\\n" {[\r\n]\+echo hi\\n[\r\n]+hi} \
          "depth resets on error part 2"