| Index: gdb/testsuite/gdb.trace/infotrace.exp | 
| diff --git a/gdb/testsuite/gdb.trace/infotrace.exp b/gdb/testsuite/gdb.trace/infotrace.exp | 
| index bdc383046c0b92f23adaac57118ed56b91782a4e..3a586cde75e53a885fe86999fb72816c57268a40 100644 | 
| --- a/gdb/testsuite/gdb.trace/infotrace.exp | 
| +++ b/gdb/testsuite/gdb.trace/infotrace.exp | 
| @@ -1,4 +1,4 @@ | 
| -#   Copyright 1998, 2007-2012 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 | 
| @@ -15,7 +15,7 @@ | 
|  | 
| # This file was written by Michael Snyder (msnyder@cygnus.com) | 
|  | 
| -load_lib "trace-support.exp"; | 
| +load_lib "trace-support.exp" | 
|  | 
|  | 
| gdb_exit | 
| @@ -39,29 +39,33 @@ gdb_file_cmd $binfile | 
| # | 
|  | 
| gdb_delete_tracepoints | 
| -set c_test_num [gdb_gettpnum gdb_c_test]; | 
| -set asm_test_num [gdb_gettpnum gdb_asm_test]; | 
| +set c_test_num [gdb_gettpnum gdb_c_test] | 
| +set asm_test_num [gdb_gettpnum gdb_asm_test] | 
| if { $c_test_num <= 0 || $asm_test_num <= 0 } then { | 
| fail "setting tracepoints" | 
| -    return; | 
| +    return | 
| } | 
|  | 
| # 2.1 info tracepoints (all) | 
| gdb_test "info tracepoints" \ | 
| "Num     Type\[ \]+Disp Enb Address\[ \]+What.* | 
| \[0-9\]+\[\t \]+tracepoint     keep y.* in gdb_c_test at .*$srcfile:\[0-9\]+. | 
| -\[0-9\]+\[\t \]+tracepoint     keep y.* in gdb_asm_test at .*$srcfile:\[0-9\]+." \ | 
| +\[\t \]+not installed on target. | 
| +\[0-9\]+\[\t \]+tracepoint     keep y.* in gdb_asm_test at .*$srcfile:\[0-9\]+. | 
| +\[\t \]+not installed on target." \ | 
| "2.1: info tracepoints (all)" | 
|  | 
| # 2.2 info tracepoint (specific) | 
| gdb_test "info tracepoint $c_test_num" \ | 
| "Num     Type\[ \]+Disp Enb Address\[ \]+What.* | 
| -\[0-9\]+\[\t \]+tracepoint     keep y.* in gdb_c_test at .*$srcfile:\[0-9\]+." \ | 
| +\[0-9\]+\[\t \]+tracepoint     keep y.* in gdb_c_test at .*$srcfile:\[0-9\]+. | 
| +\[\t \]+not installed on target." \ | 
| "2.2a: info tracepoint $c_test_num (gdb_c_test)" | 
|  | 
| gdb_test "info tracepoint $asm_test_num" \ | 
| "Num     Type\[ \]+Disp Enb Address\[ \]+What.* | 
| -\[0-9\]+\[\t \]+tracepoint     keep y.* in gdb_asm_test at .*$srcfile:\[0-9\]+." \ | 
| +\[0-9\]+\[\t \]+tracepoint     keep y.* in gdb_asm_test at .*$srcfile:\[0-9\]+. | 
| +\[\t \]+not installed on target." \ | 
| "2.2b: info tracepoint $asm_test_num (gdb_asm_test)" | 
|  | 
| # 2.3 info tracepoint (invalid tracepoint number) | 
| @@ -85,3 +89,32 @@ gdb_test "help info tracepoints" \ | 
| "Status of specified tracepoints .all tracepoints if no argument.*" \ | 
| "2.5: help info tracepoints" | 
|  | 
| +# 2.6 info tracepoints (check trace buffer usage).  We need a live | 
| +# tracing. | 
| +gdb_breakpoint "main" | 
| +gdb_trace_setactions "collect on tracepoint 1" "1" \ | 
| +	"collect gdb_struct1_test" "^$" | 
| +gdb_run_cmd | 
| +gdb_test "" "Breakpoint ${decimal}, main.*" | 
| + | 
| +if { ![gdb_target_supports_trace] } then { | 
| +    unsupported "Current target does not support trace" | 
| +    return 1 | 
| +} | 
| + | 
| +gdb_test "break end" "Breakpoint \[0-9\] at .*" | 
| +gdb_test_no_output "tstart" | 
| +gdb_test "continue" "Continuing\\.\[ \r\n\]+Breakpoint.*" \ | 
| +    "continue to end" | 
| +gdb_test_no_output "tstop" | 
| +gdb_test "tstatus" | 
| +gdb_test "info tracepoints" \ | 
| +    "Num     Type\[ \]+Disp Enb Address\[ \]+What.* | 
| +\[0-9\]+\[\t \]+tracepoint     keep y.* in gdb_c_test at .*$srcfile:\[0-9\]+. | 
| +\[\t \]+tracepoint already hit 1 time. | 
| +\[\t \]+trace buffer usage ${decimal} bytes. | 
| +\[\t \]+collect gdb_struct1_test. | 
| +\tinstalled on target. | 
| +\[0-9\]+\[\t \]+tracepoint     keep y.* in gdb_asm_test at .*$srcfile:\[0-9\]+. | 
| +\tinstalled on target." \ | 
| +    "2.6: info tracepoints (trace buffer usage)" | 
|  |