Merge GDB 7.5.1

gdb/testsuite/gdb.base/until.exp

Index: gdb/testsuite/gdb.base/until.exp
diff --git a/gdb/testsuite/gdb.base/until.exp b/gdb/testsuite/gdb.base/until.exp
index cbaccaf1a40ecd392c44a41b8e273da8968c5428..bdee21d39c5f63bddb91e742835c688157ed81ce 100644
--- a/gdb/testsuite/gdb.base/until.exp
+++ b/gdb/testsuite/gdb.base/until.exp
@@ -15,10 +15,6 @@
 
 # until.exp -- Expect script to test 'until' in gdb
 
-if $tracelevel then {
-    strace $tracelevel
-}
-
 set srcfile break.c
 if { [prepare_for_testing until.exp "until" {break.c break1.c} {debug nowarnings}] } {
     return -1
@@ -44,7 +40,8 @@ gdb_test "until $bp_location1" \
 # Verify that a malformed "advance" is gracefully caught.
 #
 gdb_test "until 80 then stop" \
-	"Junk at end of arguments." "malformed until"
+    "malformed linespec error: unexpected string, \"then stop\"." \
+    "malformed until"
 
 # Rerun up to factorial, outer invocation
 if { ![runto factorial] } then { gdb_suppress_tests; }