Merge GDB 7.5.1

gdb/testsuite/gdb.base/advance.exp

 # Copyright 2003, 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/>.  */
 
 # advance.exp -- Expect script to test 'advance' in gdb
 
-if $tracelevel then {
-    strace $tracelevel
-}
-
 set testfile advance
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
 
 remote_exec build "rm -f ${binfile}"
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
     untested advance.exp
     return -1
 }
 
@@ skipping 10 matching lines @@
 # Verify that "advance <location>" works.  (This is really just syntactic
 # sugar for "tbreak <location>; continue".)
 #
 gdb_test "advance [gdb_get_line_number "advance this location"]" \
         "main .* at .*:.*b = 3.*advance this location.*" \
         "advance line number"
 
 # Verify that a malformed "advance" is gracefully caught.
 #
 gdb_test "advance [gdb_get_line_number "advance malformed"] then stop" \
-        "Junk at end of arguments." "malformed advance"
+    "malformed linespec error: unexpected string, \"then stop\"" \
+    "malformed advance"
 
 # Verify that "advance <funcname>" works.
 #
 gdb_test "advance func" \
         "func.*at.*x = x \\+ 5." \
         "advance func"
 
 # Verify that "advance <funcname>" when funcname is NOT called by the current
 # frame, stops at the end of the current frame.
 #
@@ skipping 20 matching lines @@
 gdb_test "advance foo" \
         "foo \\(a=5\\).*int b = a \\+ 10;"\
         "advance function called as param"
 
 # Verify that we get an error if we use 'advance' w/o argument
 #
 gdb_test "advance" \
         "Argument required \\(a location\\)."\
         "advance with no argument"