PR breakpoints/8554.

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

diff --git a/gdb/testsuite/gdb.trace/save-trace.exp b/gdb/testsuite/gdb.trace/save-trace.exp
index 3ff9890438bceacd42e32ef290ebee39781a8ad4..ab927f808344ec0e06c5863392d58a670643df79 100644 (file)
--- a/gdb/testsuite/gdb.trace/save-trace.exp
+++ b/gdb/testsuite/gdb.trace/save-trace.exp
@@ -1,21 +1,17 @@
-#   Copyright (C) 1998 Free Software Foundation, Inc.
+#   Copyright 1998, 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
-# 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)
 
@@ -31,17 +27,13 @@ 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/save-trace
+if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
+         executable {debug nowarnings}] != "" } {
+    untested save-trace.exp
+    return -1
 }
 gdb_reinitialize_dir $srcdir/$subdir
 
@@ -81,6 +73,10 @@ foreach x { 1 2 3 4 5 6 } {
             "Setting tracepoint $trcpt.* to $x" \
             "10.x: set passcount for tracepoint $trcpt"
 
+    gdb_test "condition $trcpt $x - 1 == $x / 2" \
+            "" \
+            "10.x: set condition for tracepoint $trcpt"
+
     gdb_trace_setactions "10.x: set actions for tracepoint $x" \
            "" \
            "collect q$x" "^$" \
@@ -89,6 +85,9 @@ foreach x { 1 2 3 4 5 6 } {
            "end" "^$"
 }
 
+gdb_test "set default-collect gdb_char_test, gdb_long_test - 100" \
+    "" \
+    "10: set default-collect"
 
 proc gdb_verify_tracepoints { testname } {
     global gdb_prompt;
@@ -99,13 +98,10 @@ proc gdb_verify_tracepoints { testname } {
     set result "pass";
     send_gdb "info tracepoints\n";
     gdb_expect 10 {
-       -re "y\[\t \]+0x\[0-9a-fA-F\]+\[\t \]+(\[0-9\]+)\[\t \]+(\[0-9\]+)\[\t \]+in gdb_recursion_test\[^\r\n\]+" {
-           if { $expect_out(1,string) != $expect_out(2,string) } {
-               #set result "fail";
-           }
-           if { $expect_out(1,string) != $ourstate } {
-               set result "fail";
-           }
+       -re "\[0-9\]+\[\t \]+tracepoint\[\t \]+keep y\[\t \]+0x\[0-9a-fA-F\]+ in gdb_recursion_test\[^\r\n\]+\r\n\[ \t]+trace only if \[0-9\] - 1 == \[0-9\] / 2" {
+#          if { $expect_out(1,string) != $ourstate } {
+#              set result "fail";
+#          }
            incr ourstate;
            exp_continue;
        }
@@ -121,7 +117,10 @@ proc gdb_verify_tracepoints { testname } {
        }
     }
     $result $testname;
-    return $result;
+
+    gdb_test "show default-collect" \
+       "The list of expressions to collect by default is \"gdb_char_test, gdb_long_test - 100\"..*" \
+       "10: show default-collect"
 }
 
 gdb_verify_tracepoints "10.x: verify trace setup";
@@ -130,12 +129,13 @@ gdb_verify_tracepoints "10.x: verify trace setup";
 
 remote_file host delete savetrace.tr
 gdb_test "save-tracepoints savetrace.tr" \
-       "Tracepoints saved to file 'savetrace.tr'." \
+       "Saved to file 'savetrace.tr'." \
        "10.1: save tracepoint definitions"
 
 # 10.2 Read back tracepoint definitions
 
 gdb_delete_tracepoints
+gdb_test "set default-collect" "" "10.2: clear default-collect"
 gdb_test "info tracepoints" "No tracepoints." "10.2: delete tracepoints"
 gdb_test "source savetrace.tr" \
        "Tracepoint \[0-9\]+ at .*" \
@@ -145,12 +145,14 @@ remote_file host delete savetrace.tr
 
 # 10.3 repeat with a path to the file
 
+set escapedfilename [string_to_regexp $objdir/savetrace.tr]
 remote_file host delete $objdir/savetrace.tr
 gdb_test "save-tracepoints $objdir/savetrace.tr" \
-       "Tracepoints saved to file '$objdir/savetrace.tr'." \
+       "Saved to file '${escapedfilename}'." \
        "10.3: save tracepoint definitions, full path"
 
 gdb_delete_tracepoints
+gdb_test "set default-collect" "" "10.3: clear default-collect"
 gdb_test "info tracepoints" "No tracepoints." "10.3: delete tracepoints"
 gdb_test "source $objdir/savetrace.tr" \
        "Tracepoint \[0-9\]+ at .*" \