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

Yao Qi
2012-06-20T13:46:43Z

On 06/16/2012 02:59 AM, Pedro Alves wrote:
> I don't understand how the else branch works for you with remote host
> native testing, as you're checking for a file on the build machine, not
> the host (where GDB runs) (unless you're sharing /tmp between
> build and host machines, but you're probably not.)
>
> Is there anything preventing using "remote_exec target" bits always,
> getting rid of the else branch?
>

The exit code of `exit FOO' is tricky on local and remote situation. In this new version, I replace 'exit [ -S $socket_file]' with '[ -S $socket_file]', and use "remote_exec target" stuff in a unique way.

>> >
>> > gdb/testsuite:
>> >
>> > 2012-06-14 Yao Qi <yao@codesourcery.com>
>> >
>> > PR gdb/14161.
>> > * gdb.trace/strace.exp (strace_remove_socket): New proc to test
>> > the socket file is removed.
>
> The uses of the new function should be mentioned as well.
>
>> > +proc strace_remove_socket { action } {
>
>> > + sleep 5
>
> We have 3 calls to this function, adding up to 15 seconds.
>
> We could do things a bit differently to try to avoid always
> sleeping, or sleeping so much. For instance, with something like this
> pseudo code:
>
> detach
> $exists=true
> for i in 0..4 {
> if ! socket exists
> $exists=false
> break
> sleep 1
> }
> if $exists
> fail $test
> else
> pass $test
>
> IOW, check if the socket exists or not immediately after detaching. Only
> sleep if we find it still exists. With luck, expect will be slow enough, and
> we'll find the socket is gone on the first iteration, avoiding the sleep.
> If not, we'll wait one second, then re-check, etc.

It is done in my new patch. Beside these changes in this new patch, we unset gdb_spawn_id in 'strace_remove_socket', to avoid some error messages during test.

--
Yao (é½å°§)

gdb/testsuite:

2012-06-20 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'.
---
gdb/testsuite/gdb.trace/strace.exp | 108 ++++++++++++++++++++++++++++++++----
1 file changed, 98 insertions(+), 10 deletions(-)

diff --git a/gdb/testsuite/gdb.trace/strace.exp b/gdb/testsuite/gdb.trace/strace.exp
index 51da92b..d45c66d 100644
--- a/gdb/testsuite/gdb.trace/strace.exp
+++ b/gdb/testsuite/gdb.trace/strace.exp
@@ -39,6 +39,90 @@ 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
+
+ # Restart with a fresh gdb.
+ clean_restart $executable
+ 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
@@ -242,28 +326,32 @@ 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
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 {
+ # GDB detaches inferior so that the socket file can be removed.
+ gdb_test_multiple "detach" "detach" {
+ -re "Detaching .*, process .*${gdb_prompt} $" {
+ pass "detach"
+ }
+ }
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