* gdb.dwarf2/callframecfa.exp: Use gdb_continue_to_breakpoint.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 0a2c70466555317f5ff35f78176d23fc5440b3a5..8a34ca66603fa23fcc0288b9e8a0be233721aad0 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2009-09-02  Tom Tromey  <tromey@redhat.com>
+
+       * gdb.dwarf2/callframecfa.exp: Use gdb_continue_to_breakpoint.
+
 2009-09-02  Tom Tromey  <tromey@redhat.com>
 
        * gdb.dwarf2/callframecfa.exp: New file.

diff --git a/gdb/testsuite/gdb.dwarf2/callframecfa.exp b/gdb/testsuite/gdb.dwarf2/callframecfa.exp
index 00d67fcee8457c23b89a766d5020d65a9d8e6f15..19a47461783db420ba7046e4517c7eda685e4704 100644 (file)
--- a/gdb/testsuite/gdb.dwarf2/callframecfa.exp
+++ b/gdb/testsuite/gdb.dwarf2/callframecfa.exp
@@ -44,8 +44,12 @@ gdb_start
 gdb_reinitialize_dir $srcdir/$subdir
 gdb_load ${binfile}
 
-gdb_test "break *func" "Breakpoint 1.*" "set breakpoint for call-frame-cfa"
-gdb_test "run" "" "run for call-frame-cfa"
+if ![runto_main] {
+    return -1
+}
+
+gdb_test "break *func" "Breakpoint 2.*" "set breakpoint for call-frame-cfa"
+gdb_continue_to_breakpoint "continue to breakpoint for call-frame-cfa"
 gdb_test "display arg" "arg = 77" "set display for call-frame-cfa"
 
 # We know how many instructions are in the function.  Note that we