gdb/testsuite/

	* gdb.cp/cpcompletion.exp: Specify source file name explicitly.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index ff1b0099aebc25c8ce8adb2d0202944afb2fee60..3f1096579f45d5d41776339d18a3b92ab03543b8 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-16  Daniel Jacobowitz  <dan@codesourcery.com>
+
+       * gdb.cp/cpcompletion.exp: Specify source file name explicitly.
+
 2010-02-16  Daniel Jacobowitz  <dan@codesourcery.com>
 
        * gdb.base/comp-dir/subdir/dummy.txt: New file.

diff --git a/gdb/testsuite/gdb.cp/cpcompletion.exp b/gdb/testsuite/gdb.cp/cpcompletion.exp
index 69c2c6f70bf5978371f511d6604b0eac52272c8a..1afcc3edd957626a94af3f53650bdb9511d1ae21 100644 (file)
--- a/gdb/testsuite/gdb.cp/cpcompletion.exp
+++ b/gdb/testsuite/gdb.cp/cpcompletion.exp
@@ -76,8 +76,9 @@ gdb_load ${binfile}
 
 set bp_location [gdb_get_line_number "Set breakpoint here" ${testfile}.cc]
 
-if {![runto $bp_location]} {
+if {![runto "${testfile}.cc:$bp_location"]} {
     perror "test suppressed"
+    return
 }
 
 # This also tests inheritance -- completion should only see a single