gdb/testsuite/

	* gdb.cp/virtfunc.exp (do_tests): If runto_main fails, give up.

2 files changed, 8 insertions, 1 deletions

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index f6a16af..68a21f4 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,9 @@
 2009-11-13  Daniel Jacobowitz  <dan@codesourcery.com>
 
+	* gdb.cp/virtfunc.exp (do_tests): If runto_main fails, give up.
+
+2009-11-13  Daniel Jacobowitz  <dan@codesourcery.com>
+
 	* gdb.base/freebpcmd.exp: Delete unused variable.  Specify
 	srcfile when setting a breakpoint.
 
diff --git a/gdb/testsuite/gdb.cp/virtfunc.exp b/gdb/testsuite/gdb.cp/virtfunc.exp
index b857f25..d412bc9 100644
--- a/gdb/testsuite/gdb.cp/virtfunc.exp
+++ b/gdb/testsuite/gdb.cp/virtfunc.exp
@@ -247,7 +247,10 @@ proc do_tests {} {
     gdb_test "set language c++" "" ""
     gdb_test "set width 0" "" ""
 
-    runto_main
+    if ![runto_main] then {
+	perror "couldn't run to breakpoint"
+	return
+    }
     test_ptype_of_classes
 
     gdb_breakpoint test_calls