2004-10-11 Orjan Friberg <orjanf@axis.com>

	* gdb.threads/bp_in_thread.exp: Use runto_main and "continue" instead
	of "run", since the latter doesn't work with remote targets.  Adjust
	the breakpoint numbering accordingly.
	* gdb.threads/pthread_cond_wait.exp: Ditto.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index f0dfb02..c26f30c 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2004-10-11  Orjan Friberg  <orjanf@axis.com>
+
+       * gdb.threads/bp_in_thread.exp: Use runto_main and "continue" instead 
+       of "run", since the latter doesn't work with remote targets.  Adjust
+       the breakpoint numbering accordingly.
+       * gdb.threads/pthread_cond_wait.exp: Ditto.
+
 2004-10-08  Michael Chastain  <mec.gnu@mindspring.com>
 
        * gdb.base/overlays.exp: Update copyright years.

diff --git a/gdb/testsuite/gdb.threads/bp_in_thread.exp b/gdb/testsuite/gdb.threads/bp_in_thread.exp
index e9dfadb..91c3283 100644 (file)
--- a/gdb/testsuite/gdb.threads/bp_in_thread.exp
+++ b/gdb/testsuite/gdb.threads/bp_in_thread.exp
@@ -35,15 +35,16 @@ gdb_exit
 gdb_start
 gdb_reinitialize_dir $srcdir/$subdir
 gdb_load ${binfile}
+runto_main
 
 gdb_test "break noreturn" \
-         "Breakpoint 1 at .*: file .*${srcfile}, line .*" \
+         "Breakpoint 2 at .*: file .*${srcfile}, line .*" \
          "breakpoint on noreturn"
 
 # Run the program and make sure GDB reports that we stopped after
 # hitting breakpoint 1 in noreturn().
 
-gdb_test "run" \
-         ".*Breakpoint 1, noreturn ().*" \
+gdb_test "continue" \
+         ".*Breakpoint 2, noreturn ().*" \
          "run to noreturn"
 

diff --git a/gdb/testsuite/gdb.threads/pthread_cond_wait.exp b/gdb/testsuite/gdb.threads/pthread_cond_wait.exp
index 72ae03a..91b695f 100644 (file)
--- a/gdb/testsuite/gdb.threads/pthread_cond_wait.exp
+++ b/gdb/testsuite/gdb.threads/pthread_cond_wait.exp
@@ -36,13 +36,14 @@ gdb_exit
 gdb_start
 gdb_reinitialize_dir $srcdir/$subdir
 gdb_load ${binfile}
+runto_main
 
 gdb_test "break break_me" \
-    "Breakpoint 1 at .*: file .*${srcfile}, line .*" \
+    "Breakpoint 2 at .*: file .*${srcfile}, line .*" \
          "breakpoint on break_me"
 
-gdb_test "run" \
-         ".*Breakpoint 1, break_me ().*" \
+gdb_test "continue" \
+         ".*Breakpoint 2, break_me ().*" \
          "run to break_me"
 
 #