Update years in copyright notice for the GDB files.

[deliverable/binutils-gdb.git] / gdb / testsuite / gdb.trace / while-stepping.exp

diff --git a/gdb/testsuite/gdb.trace/while-stepping.exp b/gdb/testsuite/gdb.trace/while-stepping.exp
index ddce35d7e23b42569a8c3cf4a8939535226955d3..b80132b7bcc61be91507c41d5a33f45005a91240 100644 (file)
--- a/gdb/testsuite/gdb.trace/while-stepping.exp
+++ b/gdb/testsuite/gdb.trace/while-stepping.exp
@@ -1,4 +1,4 @@
-#   Copyright 1998, 2007, 2008, 2009 Free Software Foundation, Inc.
+#   Copyright 1998-2013 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
@@ -17,28 +17,15 @@
 
 load_lib "trace-support.exp";
 
-if $tracelevel then {
-    strace $tracelevel
-}
-
-set prms_id 0
-set bug_id 0
 
 gdb_exit
 gdb_start
 
-if [istarget "m68k-*-elf"] then {
-    set srcfile gdb_c_test.c
-    set binfile [board_info target d490_binfile];
-} else {
-    set testfile "actions"
-    set srcfile ${testfile}.c
-    set binfile ${objdir}/${subdir}/${testfile}
-    if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" $binfile \
-           executable {debug nowarnings}] != "" } {
-       untested while-stepping.exp
-       return -1
-    }
+standard_testfile actions.c
+if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" $binfile \
+         executable {debug nowarnings}] != "" } {
+    untested while-stepping.exp
+    return -1
 }
 gdb_reinitialize_dir $srcdir/$subdir
 
@@ -61,7 +48,9 @@ if { $trcpt1 <= 0 } then {
 # 5.12 basic while-stepping command (collect regs)
 
 gdb_test "info tracepoints" \
-       "Num Enb Address\[ \]+PassC StepC What.*$trcpt1.*0x.*\[\t \]+\[0-9\]+\[\t \]+0\[\t \]+.*in gdb_c_test.*" \
+    "Num     Type\[ \]+Disp Enb Address\[ \]+What.*
+\[0-9\]+\[\t \]+tracepoint     keep y.* in gdb_c_test at .*$srcfile:\[0-9\]+.
+\[\t \]+not installed on target." \
        "5.12: set a tracepoint, stepcount is zero"
 
 set stepcount 12
@@ -73,15 +62,11 @@ gdb_trace_setactions "5.12: set stepcount to $stepcount" \
        "end" ""
 
 gdb_test "info tracepoints" \
-    "Num Enb Address\[ \]+PassC StepC What.*$trcpt1.*0x.*\[\t \]+\[0-9\]+\[\t \]+$stepcount\[\t \]+.*in gdb_c_test.*" \
-       "5.12: confirm stepcount set to $stepcount"
-
-gdb_test "info tracepoints" \
-    "Num Enb Address\[ \]+PassC StepC What.*
-.*while-stepping $stepcount.*" \
+    "Num     Type\[ \]+Disp Enb Address\[ \]+What.*
+\[0-9\]+\[\t \]+tracepoint     keep y.* in gdb_c_test at .*$srcfile:\[0-9\]+.
+\[\t \]+while-stepping 12.*" \
        "5.12: info trace shows \"while-stepping\""
 
-
 # 5.13 step out of context while collecting local variable
 #      [deferred to dynamic test section]
 
@@ -90,7 +75,7 @@ proc while_stepping_bogus_arg { bogus msgstring } {
 
     gdb_trace_setactions "$msgstring" \
            "" \
-           "while-stepping $bogus" "\[Ee\]rror|\[Ww\]arning"
+           "while-stepping $bogus" ".*while-stepping step count"
 }
 
 # 5.14 while-stepping (no argument)
@@ -108,6 +93,9 @@ gdb_trace_setactions "5.16: step without collecting anything" \
        "end" ""
 
 gdb_test "info tracepoints" \
-       ".*$trcpt1.*0x.*\[\t \]+\[0-9\]+\[\t \]+$stepcount\[\t \]+.*in gdb_c_test.*\[ \t\]+Actions for tracepoint $trcpt1:.*\[ \t\]+while-stepping $stepcount.*\[ \t\]+end.*\[ \t\]+end.*" \
+    "Num     Type\[ \]+Disp Enb Address\[ \]+What.*
+\[0-9\]+\[\t \]+tracepoint     keep y.* in gdb_c_test at .*$srcfile:\[0-9\]+.
+.*while-stepping $stepcount.*
+.*end.*" \
        "5.16: confirm actions, step without collecting anything"