Merge GDB 7.5.1

gdb/testsuite/gdb.base/jump.exp

 #   Copyright 1998-1999, 2007-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
-        }
-
 
 clear_xfail "*-*-*"
 
 set testfile "jump"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 
 # Build the test case
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug nowarnings}] != "" } {
      untested jump.exp
@@ skipping 59 matching lines @@
 # an argument.
 #
 gdb_test "jump" "Argument required .starting address.*" \
     "jump without argument disallowed"
 
 
 # Verify that GDB responds gracefully to the "jump" command with
 # trailing junk.
 #
 gdb_test "jump 21 100" \
-    "Junk at end of line specification: 100.*" \
+    "malformed linespec error: unexpected number, \"100\"" \
     "jump with trailing argument junk"
 
 
 # Verify that GDB responds gracefully to a request to jump out of
 # the current function.  (Note that this will very likely cause the
 # inferior to die.  Be prepared to rerun the inferior, if further
 # testing is desired.)
 #
 # Try it both ways: confirming and not confirming the jump.
 #
 
 gdb_test "jump 12" \
     "Not confirmed.*" \
     "aborted jump out of current function" \
     "Line 12 is not in `main'.  Jump anyway.*y or n. $" \
     "n"
 
 gdb_test "jump 12" \
     "Continuing at.*" \
     "jump out of current function" \
     "Line 12 is not in `main'.  Jump anyway.*y or n. $" \
     "y"
 
 gdb_exit
 return 0