Merge GDB 7.5.1

gdb/testsuite/gdb.base/advance.exp

Index: gdb/testsuite/gdb.base/advance.exp
diff --git a/gdb/testsuite/gdb.base/advance.exp b/gdb/testsuite/gdb.base/advance.exp
index c4fc63f9cbda5dab7e1f8a2fa3a65c5981967ade..617a7fbb578de7eac62869943769d6e1c055d804 100644
--- a/gdb/testsuite/gdb.base/advance.exp
+++ b/gdb/testsuite/gdb.base/advance.exp
@@ -15,10 +15,6 @@
 
 # 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}
@@ -49,7 +45,8 @@ gdb_test "advance [gdb_get_line_number "advance this location"]" \
 # 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.
 #