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

[Pedro Alves <palves@redhat.com>]

On 06/09/2012 01:46 PM, Yao Qi wrote:

> This new test can expose the problem that socket file is not removed
> under some different situations,
> 
> We'll see three fails in both native and gdbserver testing,
> 
>  FAIL: gdb.trace/strace.exp: remove_socket_after_quit: socket file removed
>  FAIL: gdb.trace/strace.exp: remove_socket_after_detach: socket file removed
>  FAIL: gdb.trace/strace.exp: remove_socket_after_continue: socket file removed
> 
> gdb/testsuite:
> 
> 2012-06-09  Yao Qi  <yao@codesourcery.com>
> 
> 	PR gdb/14161.
> 	* gdb.trace/strace.exp (strace_remove_socket): New proc.


Would be more complete if said something about the new uses too.

> ---
>  gdb/testsuite/gdb.trace/strace.exp |   69 ++++++++++++++++++++++++++++++++++++
>  1 files changed, 69 insertions(+), 0 deletions(-)
> 
> diff --git a/gdb/testsuite/gdb.trace/strace.exp b/gdb/testsuite/gdb.trace/strace.exp
> index 51da92b..f141e9b 100644
> --- a/gdb/testsuite/gdb.trace/strace.exp
> +++ b/gdb/testsuite/gdb.trace/strace.exp
> @@ -39,6 +39,68 @@ if { [gdb_compile $srcdir/$subdir/$srcfile $binfile executable $additional_flags
>      return -1
>  }
>  
> +# Test socket file is removed when GDB quit, detach or resume inferior until it
> +# exits.


I think you meant:

# 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}"
> +    if { [file exists $socket_file] } {
> +	pass $test
> +    } else {
> +	fail $test
> +    }


This won't work with remote host testing.  This file is really a
file on the target.  Why not use "remote_file target exists" ?

> +
> +    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.*$" {
> +	}
> +    }


gdb_test_multiple ?

> +
> +    sleep 2
> +
> +    set test "socket file removed"
> +    if { [file exists $socket_file] } {
> +	fail $test
> +    } else {
> +	pass $test
> +    }

> +

> +}}
> +
>  proc strace_info_marker { } { with_test_prefix "info_marker" {
>      global executable
>      global gdb_prompt
> @@ -253,6 +315,9 @@ if ![runto_main] {
>  if { ![is_remote target]
>       && ([istarget "x86_64-*-linux*"] || [istarget "i\[34567\]86-*-linux*"]) } {
>      strace_info_marker
> +    strace_remove_socket "quit"
> +    strace_remove_socket "detach"
> +    strace_remove_socket "continue"
>      return
>  }
>  
> @@ -263,6 +328,10 @@ if { ![gdb_target_supports_trace] } then {
>  
>  gdb_load_shlibs $libipa
>  
> +strace_remove_socket "quit"
> +strace_remove_socket "detach"
> +strace_remove_socket "continue"
> +
>  strace_info_marker
>  strace_probe_marker


-- 
Pedro Alves