-# Copyright 1998, 2007, 2008, 2009, 2010 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
load_lib "trace-support.exp";
-if $tracelevel then {
- strace $tracelevel
-}
-
gdb_exit
gdb_start
-set testfile "actions"
-set srcfile ${testfile}.c
-set binfile $objdir/$subdir/save-trace
+standard_testfile actions.c
if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
executable {debug nowarnings}] != "" } {
untested save-trace.exp
"Setting tracepoint $trcpt.* to $x" \
"10.x: set passcount for tracepoint $trcpt"
- gdb_test "condition $trcpt $x - 1 == $x / 2" \
- "" \
+ gdb_test_no_output "condition $trcpt $x - 1 == $x / 2" \
"10.x: set condition for tracepoint $trcpt"
gdb_trace_setactions "10.x: set actions for tracepoint $x" \
"end" "^$"
}
-gdb_test "set default-collect gdb_char_test, gdb_long_test - 100" \
- "" \
+gdb_test_no_output "set default-collect gdb_char_test, gdb_long_test - 100" \
"10: set default-collect"
proc gdb_verify_tracepoints { testname } {
set nl "\[\r\n\]+"
set ourstate 1;
set result "pass";
- send_gdb "info tracepoints\n";
- gdb_expect 10 {
+ gdb_test_multiple "info tracepoints" "$testname" {
-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";
# 10.2 Read back tracepoint definitions
gdb_delete_tracepoints
-gdb_test "set default-collect" "" "10.2: clear default-collect"
+gdb_test_no_output "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 .*" \
# 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" \
+set trace_file_name [standard_output_file savetrace.tr]
+set escapedfilename [string_to_regexp $trace_file_name]
+remote_file host delete $trace_file_name
+gdb_test "save-tracepoints $trace_file_name" \
"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_no_output "set default-collect" "10.3: clear default-collect"
gdb_test "info tracepoints" "No tracepoints." "10.3: delete tracepoints"
-gdb_test "source $objdir/savetrace.tr" \
+gdb_test "source $trace_file_name" \
"Tracepoint \[0-9\]+ at .*" \
"10.4: read saved tracepoints, full path"
gdb_verify_tracepoints "10.3: verify recovered tracepoints, full path";
-remote_file host delete $objdir/savetrace.tr
+remote_file host delete $trace_file_name
# 10.5 invalid filename
# [deferred -- not sure what a good invalid filename would be]