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

[Yao Qi <yao at codesourcery dot com>]

On Tuesday 12 June 2012 22:50:49 Pedro Alves wrote:
> > +    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" ?
> 

Yes, we should use "remote_file XXX exits", however, I find "remote_file XXX
 exists" always return 0 for socket file because it uses "[ -f $file ]" to check
 whether file exists.  I work around this limitation in this way,

    set exists ""
    if [is_remote target] {
       set status [remote_exec target "sh -c \"exit `\\\[ -S $socket_file `\""]
       set exists [expr [lindex $status 0] == 0]
    } else {
       set exists [file exists $socket_file]
    }

b.t.w, the quote on tcl and bash makes crazy :)

> > +
> > +    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 ?

When I tried gdb_test_multiple, I'll get an extra fail, so I use
 send_gdb/gdb_expect,

  FAIL: gdb.trace/strace.exp: remove_socket_after_quit: quit (got interactive prompt)

This new test is tested on native on local host, native-gdbserver, and native
 on remote host.  I saw some problems when running test on remote host.  They are
 not related to this patch series, so I'd like to defer them to follow up
fix later.

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.
---
 gdb/testsuite/gdb.trace/strace.exp |   83 ++++++++++++++++++++++++++++++++++++
 1 files changed, 83 insertions(+), 0 deletions(-)

diff --git a/gdb/testsuite/gdb.trace/strace.exp b/gdb/testsuite/gdb.trace/strace.exp
index 51da92b..b96ab41 100644
--- a/gdb/testsuite/gdb.trace/strace.exp
+++ b/gdb/testsuite/gdb.trace/strace.exp
@@ -39,6 +39,82 @@ 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 exists ""
+    if [is_remote target] {
+	set status [remote_exec target "sh -c \"exit `\\\[ -S $socket_file ]`\""]
+	set exists [expr [lindex $status 0] == 0]
+    } else {
+	set exists [file exists $socket_file]
+    }
+
+    if { $exists } {
+	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.*$" {
+	}
+    }
+
+    sleep 5
+
+    set test "socket file removed"
+    if [is_remote target] {
+	set status [remote_exec target "sh -c \"exit `\\\[ -S $socket_file ]`\""]
+	set exists [expr [lindex $status 0] == 0]
+    } else {
+	set exists [file exists $socket_file]
+    }
+
+    if { $exists } {
+	fail $test
+    } else {
+	pass $test
+    }
+}}
+
 proc strace_info_marker { } { with_test_prefix "info_marker" {
     global executable
     global gdb_prompt
@@ -253,6 +329,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 +342,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
 
-- 
1.7.0.4