-# Copyright 2011 Free Software Foundation, Inc.
+# Copyright 2011-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
# the Free Software Foundation; either version 3 of the License, or
load_lib "trace-support.exp";
-if $tracelevel then {
- strace $tracelevel
-}
-
if {[skip_shlib_tests]} {
return 0
}
-set testfile "pending"
+standard_testfile
set libfile1 "pendshr1"
set libfile2 "pendshr2"
set executable $testfile
-set srcfile $testfile.c
set libsrc1 $srcdir/$subdir/$libfile1.c
set libsrc2 $srcdir/$subdir/$libfile2.c
-set binfile $objdir/$subdir/$testfile
-set lib_sl1 $objdir/$subdir/$libfile1.sl
-set lib_sl2 $objdir/$subdir/$libfile2.sl
+set lib_sl1 [standard_output_file $libfile1.sl]
+set lib_sl2 [standard_output_file $libfile2.sl]
set lib_opts [gdb_target_symbol_prefix_flags]
if ![gdb_target_supports_trace] {
unsupported "Current target does not support trace"
- return -1;
+ return -1
}
# Verify pending tracepoint is resolved to running to main.
proc pending_tracepoint_resolved { trace_type } {
- global srcdir
- global subdir
- global binfile
- global srcfile
- global lib_sl1
- global pf_prefix
-
- set old_pf_prefix $pf_prefix
- lappend pf_prefix "$trace_type" "resolved:"
-
- # Start with a fresh gdb.
- gdb_exit
- gdb_start
- gdb_reinitialize_dir $srcdir/$subdir
-
- gdb_test_multiple "$trace_type set_point1" "set pending tracepoint" {
- -re ".*Make \(fast |\)tracepoint pending.*y or \\\[n\\\]. $" {
- gdb_test "y" "\(Fast t|T\)racepoint.*set_point1.*pending." \
- "set pending tracepoint (without symbols)"
+ with_test_prefix "$trace_type resolved" {
+ global srcdir
+ global subdir
+ global binfile
+ global srcfile
+ global lib_sl1
+
+ # Start with a fresh gdb.
+ gdb_exit
+ gdb_start
+ gdb_reinitialize_dir $srcdir/$subdir
+
+ gdb_test_multiple "$trace_type set_point1" "set pending tracepoint" {
+ -re ".*Make \(fast |\)tracepoint pending.*y or \\\[n\\\]. $" {
+ gdb_test "y" "\(Fast t|T\)racepoint.*set_point1.*pending." \
+ "set pending tracepoint (without symbols)"
+ }
}
- }
- gdb_test "info trace" \
- "Num Type\[ \]+Disp Enb Address\[ \]+What.*
+ gdb_test "info trace" \
+ "Num Type\[ \]+Disp Enb Address\[ \]+What.*
\[0-9\]+\[\t \]+\(fast |\)tracepoint\[ \]+keep y.*PENDING.*set_point1.*" \
- "single pending tracepoint info (without symbols)"
+ "single pending tracepoint info (without symbols)"
- gdb_load ${binfile}
+ gdb_load ${binfile}
- gdb_test "break main" "Breakpoint.*at.* file .*$srcfile, line.*" \
- "breakpoint function"
+ gdb_test "break main" "Breakpoint.*at.* file .*$srcfile, line.*" \
+ "breakpoint function"
- gdb_run_cmd
- gdb_test "" "Breakpoint 2, main.*"
+ gdb_run_cmd
+ gdb_test "" "Breakpoint 2, main.*"
- # Run to main which should resolve a pending tracepoint
- gdb_test "info trace" \
- "Num Type\[ \]+Disp Enb Address\[ \]+What.*
+ # Run to main which should resolve a pending tracepoint
+ gdb_test "info trace" \
+ "Num Type\[ \]+Disp Enb Address\[ \]+What.*
\[0-9\]+\[\t \]+\(fast |\)tracepoint\[ \]+keep y.*pendfunc.*" \
- "single tracepoint info"
-
- set pf_prefix $old_pf_prefix
+ "single tracepoint info"
+ }
}
# Verify pending tracepoint is resolved and works as expected.
proc pending_tracepoint_works { trace_type } {
- global executable
- global srcfile
- global lib_sl1
- global pf_prefix
- global gdb_prompt
-
- set old_pf_prefix $pf_prefix
- lappend pf_prefix "$trace_type" "works:"
-
- # Restart with a fresh gdb.
- clean_restart $executable
-
- # Test setting and querying pending tracepoints
-
- gdb_test_multiple "$trace_type set_point1" "set pending tracepoint" {
- -re ".*Make \(fast |\)tracepoint pending.*y or \\\[n\\\]. $" {
- gdb_test "y" "\(Fast t|T\)racepoint.*set_point1.*pending." "set pending tracepoint"
+ with_test_prefix "$trace_type works" {
+ global executable
+ global srcfile
+ global lib_sl1
+ global gdb_prompt
+
+ # Restart with a fresh gdb.
+ clean_restart $executable
+
+ # Test setting and querying pending tracepoints
+
+ gdb_test_multiple "$trace_type set_point1" "set pending tracepoint" {
+ -re ".*Make \(fast |\)tracepoint pending.*y or \\\[n\\\]. $" {
+ gdb_test "y" \
+ "\(Fast t|T\)racepoint.*set_point1.*pending." \
+ "set pending tracepoint"
+ }
}
- }
- gdb_test "info trace" \
- "Num Type\[ \]+Disp Enb Address\[ \]+What.*
+ gdb_test "info trace" \
+ "Num Type\[ \]+Disp Enb Address\[ \]+What.*
\[0-9\]+\[\t \]+\(fast |\)tracepoint\[ \]+keep y.*PENDING.*set_point1.*" \
- "single pending tracepoint info"
-
- # Run to main which should resolve a pending tracepoint
- gdb_test "break main" "Breakpoint.*at.* file .*$srcfile, line.*" \
- "breakpoint function"
- gdb_run_cmd
- gdb_test "" "Breakpoint 2, main.*"
-
- gdb_test "break marker" "Breakpoint.*at.* file .*$srcfile, line.*" \
- "breakpoint on marker"
-
- gdb_test_no_output "tstart" "start trace experiment"
+ "single pending tracepoint info"
+
+ # Run to main which should resolve a pending tracepoint
+ gdb_test "break main" "Breakpoint.*at.* file .*$srcfile, line.*" \
+ "breakpoint function"
+ gdb_run_cmd
+ gdb_test "" "Breakpoint 2, main.*"
+
+ gdb_test "break marker" "Breakpoint.*at.* file .*$srcfile, line.*" \
+ "breakpoint on marker"
+
+ set test "start trace experiment"
+ gdb_test_multiple "tstart" $test {
+ -re "^tstart\r\n$gdb_prompt $" {
+ pass $test
+ }
+ -re "Target returns error code .* too far .*$gdb_prompt $" {
+ if [string equal $trace_type "ftrace"] {
+ # The target was unable to install the fast tracepoint
+ # (e.g., jump pad too far from tracepoint).
+ pass "$test (too far)"
+ # Skip the rest of the tests.
+ return
+ } else {
+ fail $test
+ }
+ }
- gdb_test_multiple "continue" "continue to marker" {
- -re "Continuing.\r\n\r\nBreakpoint.*marker.*at.*$srcfile.*$gdb_prompt $" {
- pass "continue to marker"
- }
- -re ".*$gdb_prompt $" {
- kfail "gdb/13392" "continue to marker"
- set pf_prefix $old_pf_prefix
- return
}
- }
- gdb_test "tstop" "\[\r\n\]+" "stop trace experiment"
+ gdb_test "continue" "Continuing.\r\n\r\nBreakpoint.*marker.*at.*$srcfile.*" \
+ "continue to marker"
- gdb_test "tfind start" "#0 .*" "tfind test frame 0"
- gdb_test "tfind" "Found trace frame 1, tracepoint 1.*" "tfind test frame 1"
- gdb_test "tfind" "Found trace frame 2, tracepoint 1.*" "tfind test frame 2"
- gdb_test "tfind" "Target failed to find requested trace frame..*" "tfind test frame"
+ gdb_test "tstop" "\[\r\n\]+" "stop trace experiment"
- set pf_prefix $old_pf_prefix
+ gdb_test "tfind start" "#0 .*" "tfind test frame 0"
+ gdb_test "tfind" "Found trace frame 1, tracepoint 1.*" \
+ "tfind test frame 1"
+ gdb_test "tfind" "Found trace frame 2, tracepoint 1.*" \
+ "tfind test frame 2"
+ gdb_test "tfind" \
+ "Target failed to find requested trace frame..*" \
+ "tfind test frame"
+ }
}
# Verify pending tracepoint is resolved during trace.
-proc pending_tracepoint_resolved_during_trace { trace_type } {
+proc pending_tracepoint_resolved_during_trace { trace_type } \
+{ with_test_prefix "$trace_type resolved_in_trace" \
+{
global executable
global srcfile
global gdb_prompt
global lib_sl1
- global pf_prefix
-
- set old_pf_prefix $pf_prefix
- lappend pf_prefix "$trace_type" "resolved_in_trace:"
# Start with a fresh gdb.
clean_restart $executable
if ![runto_main] {
fail "Can't run to main"
- set pf_prefix $old_pf_prefix
return -1
}
gdb_test "continue" "Continuing.\r\n\r\nBreakpoint.*marker.*at.*pending.c.*" \
"continue to marker 1"
- gdb_test_multiple "continue" "continue to marker 2" {
- -re "Continuing.\r\n\r\nBreakpoint.*marker.*at.*$srcfile.*$gdb_prompt $" {
- pass "continue to marker 2"
+ set test "continue to marker 2"
+ gdb_test_multiple "continue" $test {
+ -re "Target returns error code .* too far .*$gdb_prompt $" {
+ if [string equal $trace_type "ftrace"] {
+ # Expected if the target was unable to install the
+ # fast tracepoint (e.g., jump pad too far from
+ # tracepoint).
+ pass "$test (too far)"
+ # Skip the rest of the tests.
+ return
+ } else {
+ fail $test
+ }
}
- -re ".*$gdb_prompt $" {
- kfail "gdb/13392" "continue to marker 2"
- set pf_prefix $old_pf_prefix
- return
+ -re "Continuing.\r\n\r\nBreakpoint.*marker.*at.*$srcfile.*$gdb_prompt $" {
+ pass $test
}
}
gdb_test "tfind start" "#0 .*" "tfind test frame 0"
gdb_test "tfind" "Target failed to find requested trace frame..*" "tfind test frame"
-
- set pf_prefix $old_pf_prefix
-}
+}}
# Verify pending tracepoint is resolved and installed during trace.
-proc pending_tracepoint_installed_during_trace { trace_type } {
+proc pending_tracepoint_installed_during_trace { trace_type } \
+{ with_test_prefix "$trace_type installed_in_trace" \
+{
global executable
global srcfile
global lib_sl1
global gdb_prompt
- global pf_prefix
global hex
- set old_pf_prefix $pf_prefix
- lappend pf_prefix "$trace_type" "installed_in_trace:"
-
# Start with a fresh gdb.
clean_restart $executable
if ![runto_main] {
fail "Can't run to main"
- set pf_prefix $old_pf_prefix
return -1
}
\[0-9\]+\[\t \]+\(fast |\)tracepoint\[ \t\]+keep y.*PENDING.*set_point2.*" \
"single pending tracepoint on set_point2"
- gdb_test_multiple "continue" "continue to marker 2" {
- -re "Continuing.\r\n\r\nBreakpoint.*marker.*at.*$srcfile.*$gdb_prompt $" {
- pass "continue to marker 2"
- }
- -re ".*$gdb_prompt $" {
- kfail "gdb/13392" "continue to marker 2"
- set pf_prefix $old_pf_prefix
- return
+ set test "continue to marker 2"
+ gdb_test_multiple "continue" $test {
+ -re "Target returns error code .* too far .*$gdb_prompt $" {
+ if [string equal $trace_type "ftrace"] {
+ # Expected if the target was unable to install the
+ # fast tracepoint (e.g., jump pad too far from
+ # tracepoint).
+ pass "$test (too far)"
+ # Skip the rest of the tests.
+ return
+ } else {
+ fail $test
+ }
}
+ -re "Continuing.\r\n\r\nBreakpoint.*marker.*at.*$srcfile.*$gdb_prompt $" {
+ pass $test
+ }
}
gdb_test "tstop" "\[\r\n\]+" "stop trace experiment"
gdb_test "tfind start" "#0 $hex in pendfunc2 .*" "tfind test frame 0"
gdb_test "tfind" "Target failed to find requested trace frame..*" "tfind test frame"
-
- set pf_prefix $old_pf_prefix
-}
+}}
# Verify pending tracepoint will no longer work if we disconnect during tracing.
-proc pending_tracepoint_disconnect_during_trace { trace_type } {
+proc pending_tracepoint_disconnect_during_trace { trace_type } \
+{ with_test_prefix "$trace_type disconn" \
+{
global executable
global srcfile
global lib_sl1
- global pf_prefix
global gdb_prompt
- set old_pf_prefix $pf_prefix
- lappend pf_prefix "$trace_type" "disconn:"
-
# Start with a fresh gdb.
clean_restart $executable
if ![runto_main] {
fail "Can't run to main"
- set pf_prefix $old_pf_prefix
return -1
}
}
}
}
-
- set pf_prefix $old_pf_prefix
-}
+}}
# Verify disconnect after pending tracepoint has been resolved.
-proc pending_tracepoint_disconnect_after_resolved { trace_type } {
+proc pending_tracepoint_disconnect_after_resolved { trace_type } \
+{ with_test_prefix "$trace_type disconn_resolved" \
+{
global executable
global srcfile
global lib_sl1
global gdb_prompt
- global pf_prefix
-
- set old_pf_prefix $pf_prefix
- lappend pf_prefix "$trace_type" "disconn_resolved:"
# Start with a fresh gdb.
clean_restart $executable
if ![runto_main] {
fail "Can't run to main"
- set pf_prefix $old_pf_prefix
return -1
}
pass "$test"
}
}
-
- set pf_prefix $old_pf_prefix
-}
+}}
# Verify action works properly in resolved tracepoint.
-proc pending_tracepoint_with_action_resolved { trace_type } {
+proc pending_tracepoint_with_action_resolved { trace_type } \
+{ with_test_prefix "$trace_type action_resolved" \
+{
global executable
global srcfile
global lib_sl1
global gdb_prompt
- global pf_prefix
-
- set old_pf_prefix $pf_prefix
- lappend pf_prefix "$trace_type" "action_resolved:"
# Start with a fresh gdb.
clean_restart $executable
if ![runto_main] {
fail "Can't run to main"
- set pf_prefix $old_pf_prefix
return -1
}
gdb_test "continue" "Continuing.\r\n\r\nBreakpoint.*marker.*at.*pending.c.*" \
"continue to marker 1"
- gdb_test_multiple "continue" "continue to marker 2" {
+ set test "continue to marker 2"
+ gdb_test_multiple "continue" $test {
+ -re "Target returns error code .* too far .*$gdb_prompt $" {
+ if [string equal $trace_type "ftrace"] {
+ # Expected if the target was unable to install the
+ # fast tracepoint (e.g., jump pad too far from
+ # tracepoint).
+ pass "$test (too far)"
+ # Skip the rest of the tests.
+ return
+ } else {
+ fail $test
+ }
+ }
-re "Continuing.\r\n\r\nBreakpoint.*marker.*at.*$srcfile.*$gdb_prompt $" {
pass "continue to marker 2"
}
- -re ".*$gdb_prompt $" {
- kfail "gdb/13392" "continue to marker 2"
- set pf_prefix $old_pf_prefix
- return
- }
+
}
gdb_test "tstop" "\[\r\n\]+" "stop trace experiment"
gdb_test "tfind start" "#0 .*" "tfind test frame 0"
gdb_test "tdump" "Data collected at tracepoint .*, trace frame \[0-9\]:.*\\$${pcreg} = .*"
gdb_test "tfind" "Target failed to find requested trace frame..*" "tfind test frame"
-
- set pf_prefix $old_pf_prefix
-}
+}}
pending_tracepoint_resolved "trace"
pending_tracepoint_installed_during_trace "trace"
# Re-compile test case with IPA.
-set libipa $objdir/../gdbserver/libinproctrace.so
+set libipa [get_in_proc_agent]
gdb_load_shlibs $libipa
lappend exec_opts "shlib=$libipa"
projects / external / binutils.git / blobdiff