From 610c33621293cce01b9f2eeaecebc509ed82dbe8 Mon Sep 17 00:00:00 2001
From: Nathan Sidwell <nathan@codesourcery.com>
Date: Tue, 8 Mar 2005 10:12:21 +0000
Subject: 	* gdb.base/sigbpt.exp: Disable if gdb,nosignals. 	*
 gdb.base/signull.exp: Disable if gdb,nosignals. 	* gdb.cp/bs15503.exp:
 Disable if skip_cplus_tests 	* gdb.cp/exception.exp: Disable if
 skip_cplus_tests. 	* gdb.mi/mi-console.exp: Disable hello test if
 gdb,noinferiorio. 	* gdb.mi/mi2-console.exp: Likewise. 	*
 gdb.trace/collection.exp (run_trace_experiment): Consume the 	continue
 output at start. 	(gdb_collect_locals_test): Robustify regexp. 	*
 gdb.trace/passc-dyn.exp: Fix comment typo. 	* gdb.trace/tfind.exp: Don't
 enable optimization. Remove stray ']'.

---
 gdb/testsuite/gdb.trace/collection.exp | 15 +++++++++++++--
 gdb/testsuite/gdb.trace/passc-dyn.exp  |  2 +-
 gdb/testsuite/gdb.trace/tfind.exp      |  8 ++------
 3 files changed, 16 insertions(+), 9 deletions(-)

(limited to 'gdb/testsuite/gdb.trace')

diff --git a/gdb/testsuite/gdb.trace/collection.exp b/gdb/testsuite/gdb.trace/collection.exp
index a6ac5d80248..61fddd8bd52 100644
--- a/gdb/testsuite/gdb.trace/collection.exp
+++ b/gdb/testsuite/gdb.trace/collection.exp
@@ -79,7 +79,18 @@ proc test_register { reg test_id } {
 }
 
 proc run_trace_experiment { msg test_func } {
-    gdb_run_cmd 
+    global gdb_prompt
+    gdb_run_cmd
+    gdb_expect {
+	-re ".*Breakpoint \[0-9\]+, begin .*$gdb_prompt $" { 
+	}
+	-re ".*$gdb_prompt $" { 
+	    fail "collect $msg: advance to go"
+	}
+	timeout { 
+	    fail "collect $msg: advance to go (timeout)"
+	}
+    }
     gdb_test "tstart" \
 	    "\[\r\n\]+" \
 	    "collect $msg: start trace experiment"
@@ -280,7 +291,7 @@ proc gdb_collect_locals_test { func mylocs msg } {
     run_trace_experiment $msg $func
 
     gdb_test "print locc" \
-	    "\\$\[0-9\]+ = 11 '.013'$cr" \
+	"\\$\[0-9\]+ = 11 '.\[a-z0-7\]+'$cr" \
 	    "collect $msg: collected local char"
     gdb_test "print loci" \
 	    "\\$\[0-9\]+ = 12$cr" \
diff --git a/gdb/testsuite/gdb.trace/passc-dyn.exp b/gdb/testsuite/gdb.trace/passc-dyn.exp
index d0c27ea4386..fc096c85605 100644
--- a/gdb/testsuite/gdb.trace/passc-dyn.exp
+++ b/gdb/testsuite/gdb.trace/passc-dyn.exp
@@ -66,7 +66,7 @@ gdb_reinitialize_dir $srcdir/$subdir
 # We generously give ourselves one "pass" if we successfully 
 # detect that this test cannot be run on this target!
 if { ![gdb_target_supports_trace] } then {
-    pass "Current target does not supporst trace"
+    pass "Current target does not support trace"
     return 1;
 
 }
diff --git a/gdb/testsuite/gdb.trace/tfind.exp b/gdb/testsuite/gdb.trace/tfind.exp
index 95073518218..e11bb7f994e 100644
--- a/gdb/testsuite/gdb.trace/tfind.exp
+++ b/gdb/testsuite/gdb.trace/tfind.exp
@@ -54,12 +54,8 @@ if [istarget "m68k-*-elf"] then {
     set srcfile ${testfile}.c
     set binfile $objdir/$subdir/$testfile
 
-    # Why does this test require '-O1' level optimization?  (In
-    # general, the optimization level should be left under the control
-    # of the test framework (target_list and so on), so if we don't
-    # have to override it in individual tests like this, we shouldn't.)
     if { [gdb_compile "$srcdir/$subdir/$srcfile" "$binfile" \
-	    executable {debug additional_flags=-w optimize=-O1}] != "" } {
+	    executable {debug additional_flags=-w}] != "" } {
 	gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
     }
     gdb_load $binfile
@@ -303,7 +299,7 @@ gdb_tfind_test "8.13: tracepoint <no arg>" "tracepoint" \
 	"\$tracepoint" "$tdp1";
 gdb_test "printf \"x \%d x\\n\", \$trace_frame == \$save_frame" \
 	"x 0 x" \
-	"8.13: tracepoint <no arg>, tracepoint number unchanged"]
+	"8.13: tracepoint <no arg>, tracepoint number unchanged"
 
 # 1.12 set tracepoint in prologue
 #
-- 
cgit v1.2.1