Copyright year update in most files of the GDB Project.

[pf3gnuchains/pf3gnuchains4x.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 7a0a41f..0ee27fd 100644 (file)
--- a/gdb/testsuite/gdb.trace/while-stepping.exp
+++ b/gdb/testsuite/gdb.trace/while-stepping.exp
@@ -1,21 +1,17 @@
-#   Copyright 1998 Free Software Foundation, Inc.
+#   Copyright 1998, 2007-2012 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
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  
-
-# Please email any bugs, comments, and/or additions to this file to:
-# bug-gdb@prep.ai.mit.edu
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 # This file was written by Michael Snyder (msnyder@cygnus.com)
 
@@ -25,23 +21,17 @@ 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 additional_flags=-w}] != "" } {
-       gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail."
-    }
+set testfile "actions"
+set srcfile ${testfile}.c
+set binfile ${objdir}/${subdir}/while-stepping
+if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" $binfile \
+         executable {debug nowarnings}] != "" } {
+    untested while-stepping.exp
+    return -1
 }
 gdb_reinitialize_dir $srcdir/$subdir
 
@@ -64,7 +54,8 @@ 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\]+" \
        "5.12: set a tracepoint, stepcount is zero"
 
 set stepcount 12
@@ -76,15 +67,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]
 
@@ -93,7 +80,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)
@@ -111,6 +98,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"