* gdb.trace/tfind.exp: Adjust expected disassembly output.

[binutils-gdb.git] / gdb / testsuite / gdb.trace / tfind.exp

diff --git a/gdb/testsuite/gdb.trace/tfind.exp b/gdb/testsuite/gdb.trace/tfind.exp
index 6366719ca2999cadf00af09eef7638f45fd13261..fcbbd1d41de7357136b730ac648b06691ad3f085 100644 (file)
--- a/gdb/testsuite/gdb.trace/tfind.exp
+++ b/gdb/testsuite/gdb.trace/tfind.exp
@@ -1,4 +1,5 @@
-#   Copyright 1998, 2002, 2005, 2007, 2008 Free Software Foundation, Inc.
+#   Copyright 1998, 2002, 2005, 2007, 2008, 2009, 2010
+#   Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -27,40 +28,19 @@ set bug_id 0
 gdb_exit
 gdb_start
 
-if [istarget "m68k-*-elf"] then {
-    load_lib "emc-support.exp";
-    set srcfile gdb_c_test.c
-    set binfile [board_info target d490_binfile];
-    gdb_test "set remotetimeout 6" "" ""
-    set timeout 500
-    gdb_target_monitor $binfile
-    # Give a TSTOP and ignore errors, to make sure any previous trace is off
-    gdb_test "tstop" "" ""
-    gdb_test "tfind none" "" ""
-    send_gdb "compare-sections CS\n"
-    gdb_expect {
-       -re "MIS-MATCHED.*$gdb_prompt $" {
-           untested tfind.exp
-           return -1
-           all tests in this module will fail.";
-       }
-       -re ".*$gdb_prompt $" { }
-    }
-} else {
-    set testfile "actions"
-    set srcfile ${testfile}.c
-    set binfile $objdir/$subdir/$testfile
-
-    if { [gdb_compile "$srcdir/$subdir/$srcfile" "$binfile" \
-           executable {debug nowarnings}] != "" } {
-       untested tfind.exp
-       return -1
-    }
-    gdb_load $binfile
-    gdb_test "tstop"       "" ""
-    gdb_test "tfind none"  "" ""
-    runto_main
+set testfile "actions"
+set srcfile ${testfile}.c
+set binfile $objdir/$subdir/tfind
+
+if { [gdb_compile "$srcdir/$subdir/$srcfile" "$binfile" \
+         executable {debug nowarnings}] != "" } {
+    untested tfind.exp
+    return -1
 }
+gdb_load $binfile
+gdb_test "tstop"       "" ""
+gdb_test "tfind none"  "" ""
+runto_main
 gdb_reinitialize_dir $srcdir/$subdir
 
 # We generously give ourselves one "pass" if we successfully 
@@ -134,18 +114,10 @@ gdb_test "tstatus" "\[Tt\]race is running.*" "test tstatus on"
 # 6.2 test help tstart
 gdb_test "help tstart" "Start trace data collection." "6.2: help tstart"
 
-if [istarget "m68k-*-elf"] then {
-    gdb_emclaptop_command "85,1,2,3,4,5,6"
-    sleep 5
-    
-    gdb_emclaptop_command "85,7,8,9,A,B,C"
-    sleep 5
-} else {
-    gdb_test "break end" "" ""
-    gdb_test "continue" \
-           "Continuing.*Breakpoint $decimal, end.*" \
-           "run trace experiment"
-}
+gdb_test "break end" "" ""
+gdb_test "continue" \
+    "Continuing.*Breakpoint $decimal, end.*" \
+    "run trace experiment"
 
 # 7.1 test tstop command
 send_gdb "tstop\n"
@@ -175,7 +147,8 @@ gdb_expect {
 gdb_test "help tstop" "Stop trace data collection." "7.2: help tstop"
 
 # test tstatus (when trace off)
-gdb_test "tstatus" "\[Tt\]race.* not running.*" "test tstatus off"
+gdb_test "tstatus" "Trace stopped by a tstop command.*" \
+    "test tstatus off after tstop"
 
 ## record starting PC
 set save_pc [gdb_readexpr "(unsigned long) \$pc"];
@@ -361,7 +334,7 @@ set timeout 60
 send_gdb "disassemble gdb_c_test\n"
 # look for disassembly of function label
 gdb_expect {
-    -re "<gdb_c_test>:.*$gdb_prompt $"      { pass "8.36: trace disassembly" }
+    -re "<(\.\[0-9\]+|)>:.*End of assembler dump.*$gdb_prompt $"      { pass "8.36: trace disassembly" }
     -re ".*$gdb_prompt $"                   { fail "8.36: trace disassembly" }
     timeout                       { fail "8.36: trace disassembly (timeout)" }
 }