Re: [PATCH 1/4] New test for removing socket file in gdb.trace/strace.exp.

Yao Qi
2012-06-27T03:55:36Z

On 06/21/2012 11:56 PM, Pedro Alves wrote:
>> > if { ![gdb_target_supports_trace] } then {
>> > + # GDB detaches inferior so that the socket file can be removed.
>> > + gdb_test_multiple "detach" "detach" {
>> > + -re "Detaching .*, process .*${gdb_prompt} $" {
>> > + pass "detach"
>> > + }
>> > + }
>
> This could just be gdb_test ? But I'm confused on why "detach"
> is needed at all here, going from that comment. Wouldn't not
> doing anything (and therefore gdb quitting and killing the inferior)
> have the same effect?

Yes, gdb_test is better. The reason GDB detaches here is that socket
file has been created at this point, and only GDB detach inferior can
remove the socket file. I add some comments more here.

>
>> > unsupported "Current target does not support trace"
>> > return -1;
>> > }
>> >
>> > gdb_load_shlibs $libipa
>
> If we now have tests earlier that run against remote targets,
> it seems this should be moved earlier too.
>

I noticed this problem when run it on remote-host, and planed to put
the fix in next series. I cherry-pick'ed the fix into this patch. In
short, 'gdb_load_shlibs $libipa' is invoked after each clean_restart.

--
Yao (é½å°§)

gdb/testsuite:

2012-06-27 Yao Qi <yao@codesourcery.com>

PR gdb/14161.
* gdb.trace/strace.exp (strace_remove_socket): New proc to test
the socket file is removed.
Invoke proc strace_remove_socket without checking
'is_remote target'.
(strace_remove_socket, strace_probe_marker): Call proc gdb_load_shlibs.
(strace_trace_on_same_addr, strace_trace_on_diff_addr): Likewise.
---
gdb/testsuite/gdb.trace/strace.exp | 120 ++++++++++++++++++++++++++++++++----
1 file changed, 108 insertions(+), 12 deletions(-)

diff --git a/gdb/testsuite/gdb.trace/strace.exp b/gdb/testsuite/gdb.trace/strace.exp
index d9e90b6..33700c2 100644
--- a/gdb/testsuite/gdb.trace/strace.exp
+++ b/gdb/testsuite/gdb.trace/strace.exp
@@ -37,12 +37,100 @@ if { [gdb_compile $srcdir/$subdir/$srcfile $binfile executable $additional_flags
return -1
}

+# Test that the socket file is removed when GDB quits, detaches or
+# resumes the inferior until it exits.
+
+proc strace_remove_socket { action } {
+ with_test_prefix "remove_socket_after_${action}" {
+
+ global executable
+ global gdb_prompt
+ global libipa
+
+ # Restart with a fresh gdb.
+ clean_restart $executable
+ gdb_load_shlibs $libipa
+ if ![runto_main] {
+ fail "Can't run to main"
+ return -1
+ }
+
+ # List the markers in program.
+ gdb_test "info static-tracepoint-markers" \
+ ".*ust/bar\[\t \]+n\[\t \]+.*ust/bar2\[\t \]+n\[\t \]+.*"
+
+ set pid ""
+ set test "collect pid"
+ gdb_test_multiple "info inferiors" $test {
+ -re "process (\[-0-9a-fx\]+) \[^\n\]*\n.*${gdb_prompt} $" {
+ set pid $expect_out(1,string)
+ pass $test
+ }
+ -re ".*${gdb_prompt} $" {
+ fail $test
+ }
+ }
+
+ set test "socket file exists"
+ set socket_file "/tmp/gdb_ust${pid}"
+ set status [remote_exec target "sh -c { \[ -S $socket_file \] }"]
+
+ if { [lindex $status 0] == 0 } {
+ pass $test
+ } else {
+ fail $test
+ }
+
+ send_gdb "${action}\n"
+ gdb_expect {
+ -re "A debugging session is active.\r\n.*\r\nQuit anyway\\? \\(y or n\\) $" {
+ send_gdb "y\n"
+ }
+ -re "Detaching .*, process .*$" {
+ }
+ -re "Continuing.*$" {
+ }
+ }
+
+ set exists 1
+
+ for {set i 1} {$i <= 5} {incr i} {
+ set status [remote_exec target "sh -c { \[ -S $socket_file \] }"]
+ if { [lindex $status 0] != 0 } {
+ set exists 0
+ break
+ }
+ sleep 1
+ }
+
+ if { ![is_remote target] && ![string equal $action "detach"] } {
+ setup_kfail gdb/14161 *-*-*
+ }
+
+ set test "socket file removed"
+
+ if { $exists } {
+ fail $test
+ } else {
+ pass $test
+ }
+
+ if { [string equal $action "quit"] && [is_remote host] } {
+ global gdb_spawn_id
+ # unset gdb_spawn_id here to avoid sending command 'quit' to GDB
+ # later in default_gdb_exit.
+ unset gdb_spawn_id
+ }
+}}
+
proc strace_info_marker { } { with_test_prefix "info_marker" {
global executable
global gdb_prompt
+ global libipa

# Restart with a fresh gdb.
clean_restart $executable
+ gdb_load_shlibs $libipa
if ![runto_main] {
fail "Can't run to main"
return -1
@@ -66,9 +154,11 @@ proc strace_probe_marker { } { with_test_prefix "probe_marker" {
global expect_out
global gdb_prompt
global hex
+ global libipa

# Restart with a fresh gdb.
clean_restart $executable
+ gdb_load_shlibs $libipa
if ![runto_main] {
fail "Can't run to main"
return -1
@@ -97,9 +187,11 @@ with_test_prefix "trace_same_addr $type" {
global expect_out
global gdb_prompt
global hex
+ global libipa

# Restart with a fresh gdb.
clean_restart $executable
+ gdb_load_shlibs $libipa
if ![runto_main] {
fail "Can't run to main"
return -1
@@ -192,9 +284,11 @@ proc strace_trace_on_diff_addr { } { with_test_prefix "trace_diff_addr" {
global expect_out
global gdb_prompt
global hex
+ global libipa

# Restart with a fresh gdb.
clean_restart $executable
+ gdb_load_shlibs $libipa
if ![runto_main] {
fail "Can't run to main"
return -1
@@ -240,28 +334,30 @@ proc strace_trace_on_diff_addr { } { with_test_prefix "trace_diff_addr" {
gdb_test "tfind" "Target failed to find requested trace frame\\..*"
}}

-clean_restart $executable
+# Run it on x86/x86_64 linux.
+if { [istarget "x86_64-*-linux*"] || [istarget "i\[34567\]86-*-linux*"] } {
+ strace_info_marker
+ strace_remove_socket "quit"
+ strace_remove_socket "detach"
+ strace_remove_socket "continue"
+}

+clean_restart $executable
+gdb_load_shlibs $libipa
if ![runto_main] {
fail "Can't run to main to check for trace support"
return -1
}
-
-# Run it on native x86/x86_64 linux.
-if { ![is_remote target]
- && ([istarget "x86_64-*-linux*"] || [istarget "i\[34567\]86-*-linux*"]) } {
- strace_info_marker
- return
-}
-
if { ![gdb_target_supports_trace] } then {
+ # At this point, the socket file has been created. We must make sure it is
+ # removed when we return here. GDB detaches inferior so that the socket
+ # file can be removed. Note that GDB simply kill inferior doesn't remove
+ # the socket file.
+ gdb_test "detach" "Detaching .*, process .*"
unsupported "Current target does not support trace"
return -1;
}

-gdb_load_shlibs $libipa
-
-strace_info_marker
strace_probe_marker

strace_trace_on_same_addr "trace"
--
1.7.9.5