Merge GDB 7.5.1

gdb/testsuite/gdb.base/condbreak.exp

Index: gdb/testsuite/gdb.base/condbreak.exp
diff --git a/gdb/testsuite/gdb.base/condbreak.exp b/gdb/testsuite/gdb.base/condbreak.exp
index 7f09094f95fa31b1e69b2e6fd0e81c220ee5fc83..e8e0d84ef84e2c16fe0eb4d56088aa315541e20d 100644
--- a/gdb/testsuite/gdb.base/condbreak.exp
+++ b/gdb/testsuite/gdb.base/condbreak.exp
@@ -17,12 +17,6 @@
 # Purpose is to test conditional breakpoints.
 # Modeled after "break.exp".
 
-if $tracelevel then {
-	strace $tracelevel
-	}
-
-global usestubs
-
 #
 # test running programs
 #
@@ -47,7 +41,7 @@ if  { [gdb_compile "${binfile}0.o ${binfile}1.o" "${binfile}" executable {debug
      return -1
 }
 
-if [get_compiler_info ${binfile}] {
+if [get_compiler_info] {
     return -1;
 }
 
@@ -57,10 +51,6 @@ gdb_reinitialize_dir $srcdir/$subdir
 gdb_load ${binfile}
 
 
-if [target_info exists gdb_stub] {
-    gdb_step_for_stub;
-}
-
 set bp_location1  [gdb_get_line_number "set breakpoint 1 here"]
 set bp_location6  [gdb_get_line_number "set breakpoint 6 here"]
 set bp_location8  [gdb_get_line_number "set breakpoint 8 here" $srcfile1]
@@ -271,3 +261,8 @@ gdb_test_multiple "continue" $test {
 	xfail $test
     }
 }
+
+gdb_test "complete cond 1" "cond 1"
+gdb_test "set variable \$var = 1"
+gdb_test "complete cond \$v" "cond \\\$var"
+gdb_test "complete cond 1 values\[0\].a" "cond 1 values.0..a_field"