From 7027acc71260d05e8ba9983bceb92bf162af1241 Mon Sep 17 00:00:00 2001
From: Mark Kettenis <kettenis@gnu.org>
Date: Sun, 23 Nov 2003 21:14:45 +0000
Subject: [PATCH] * gdb.arch/i386-unwind.exp: Use gdb_run_cmd and gdb_expect
 instead of gdb_test "run".

---
 gdb/testsuite/ChangeLog                |  5 +++++
 gdb/testsuite/gdb.arch/i386-unwind.exp | 17 +++++++++++++++--
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 27f40deefb3..954a1c13f44 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-23  Mark Kettenis  <kettenis@gnu.org>
+
+	* gdb.arch/i386-unwind.exp: Use gdb_run_cmd and gdb_expect instead
+	of gdb_test "run".
+
 2003-11-23  Mark Kettenis  <kettenis@gnu.org>
 
 	* gdb.arch/i386-unwind.exp: Don't use runto_main.  Change
diff --git a/gdb/testsuite/gdb.arch/i386-unwind.exp b/gdb/testsuite/gdb.arch/i386-unwind.exp
index fa01a8d092c..9c3130fc8c3 100644
--- a/gdb/testsuite/gdb.arch/i386-unwind.exp
+++ b/gdb/testsuite/gdb.arch/i386-unwind.exp
@@ -47,8 +47,21 @@ gdb_load ${binfile}
 
 # Testcase for backtrace/1435.
 
-gdb_test "run" "Program received signal SIGTRAP.*" \
-         "run past gdb1435"
+# We use gdb_run_cmd so this stands a chance to work for remote
+# targets too.
+gdb_run_cmd
+
+gdb_expect {
+    -re "Program received signal SIGTRAP.*$gdb_prompt $" {
+	pass "run past gdb1435"
+    }
+    -re ".*$gdb_prompt $" {
+	fail "run past gdb1435"
+    }
+    timeout {
+	fail "run past gdb1435 (timeout)"
+    }
+}
 
 gdb_test "backtrace 10" \
 	"#1\[ \t]*$hex in gdb1435.*\r\n#2\[ \t\]*$hex in main.*" \
-- 
2.30.2