diff mbox series

[gdb/testsuite] Fix gdb.base/attach-deleted-exec.exp with NFS

Message ID 20240902084212.28604-1-tdevries@suse.de
State Committed
Headers
Series [gdb/testsuite] Fix gdb.base/attach-deleted-exec.exp with NFS |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_gdb_build--master-aarch64 success Build passed
linaro-tcwg-bot/tcwg_gdb_build--master-arm success Build passed
linaro-tcwg-bot/tcwg_gdb_check--master-aarch64 success Test passed

Commit Message

Tom de Vries Sept. 2, 2024, 8:42 a.m. UTC 
  With test-case gdb.base/attach-deleted-exec.exp I ran into:
...
(gdb) attach 121552^M
Attaching to process 121552^M
Reading symbols .../attach-deleted-exec/.nfs00000000044ff2ef00000086...^M
Reading symbols from /lib64/libm.so.6...^M
(No debugging symbols found in /lib64/libm.so.6)^M
Reading symbols from /lib64/libc.so.6...^M
(No debugging symbols found in /lib64/libc.so.6)^M
Reading symbols from /lib64/ld64.so.2...^M
(No debugging symbols found in /lib64/ld64.so.2)^M
0x00007fff947cc838 in clock_nanosleep@@GLIBC_2.17 () from /lib64/libc.so.6^M
(gdb) FAIL: $exp: attach to process with deleted executable
....

The .nfs file indicates:
- that the file has been removed on the NFS server, and
- that the file is still open on the NFS client.

Fix this by detecting this situation, and declaring the test for filename
/proc/PID/exe unsupported.

Tested on:
- x86_64-linux (setup without NFS)
- ppc64le-linux (setup with NFS)

PR testsuite/32130
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=32130
---
 .../gdb.base/attach-deleted-exec.exp          | 24 ++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)


base-commit: 85e370a3d63f88386e98b435f43fa63e9e54130b

Comments

Tom de Vries Sept. 23, 2024, 5:53 a.m. UTC | #1 
On 9/2/24 10:42, Tom de Vries wrote:
> With test-case gdb.base/attach-deleted-exec.exp I ran into:
> ...
> (gdb) attach 121552^M
> Attaching to process 121552^M
> Reading symbols .../attach-deleted-exec/.nfs00000000044ff2ef00000086...^M
> Reading symbols from /lib64/libm.so.6...^M
> (No debugging symbols found in /lib64/libm.so.6)^M
> Reading symbols from /lib64/libc.so.6...^M
> (No debugging symbols found in /lib64/libc.so.6)^M
> Reading symbols from /lib64/ld64.so.2...^M
> (No debugging symbols found in /lib64/ld64.so.2)^M
> 0x00007fff947cc838 in clock_nanosleep@@GLIBC_2.17 () from /lib64/libc.so.6^M
> (gdb) FAIL: $exp: attach to process with deleted executable
> ....
> 
> The .nfs file indicates:
> - that the file has been removed on the NFS server, and
> - that the file is still open on the NFS client.
> 
> Fix this by detecting this situation, and declaring the test for filename
> /proc/PID/exe unsupported.
> 

Pushed.

Thanks,
- Tom

> Tested on:
> - x86_64-linux (setup without NFS)
> - ppc64le-linux (setup with NFS)
> 
> PR testsuite/32130
> Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=32130
> ---
>   .../gdb.base/attach-deleted-exec.exp          | 24 ++++++++++++++++---
>   1 file changed, 21 insertions(+), 3 deletions(-)
> 
> diff --git a/gdb/testsuite/gdb.base/attach-deleted-exec.exp b/gdb/testsuite/gdb.base/attach-deleted-exec.exp
> index 3e31c36bcc4..11961153fe7 100644
> --- a/gdb/testsuite/gdb.base/attach-deleted-exec.exp
> +++ b/gdb/testsuite/gdb.base/attach-deleted-exec.exp
> @@ -45,9 +45,27 @@ clean_restart
>   
>   # Attach.  GDB should spot that the executable is gone and fallback to
>   # use /proc/PID/exe.
> -gdb_test "attach $testpid" \
> -    "Attaching to process $decimal\r\nReading symbols from /proc/${testpid}/exe\\.\\.\\..*" \
> -    "attach to process with deleted executable"
> +set test "attach to process with deleted executable"
> +set re \
> +    [multi_line \
> +	 "Attaching to process $decimal" \
> +	 "Reading symbols from (\[^\r\n\]+)[string_to_regexp ...]" \
> +	 ".*"]
> +set filename ""
> +gdb_test_multiple "attach $testpid" $test {
> +    -re -wrap $re {
> +	set filename $expect_out(1,string)
> +	pass $gdb_test_name
> +    }
> +}
> +
> +set test "filename /proc/PID/exe"
> +set re_nfs \[^\r\n\]+[string_to_regexp /.nfs]\[^\r\n\]+
> +if { [regexp $re_nfs $filename] } {
> +    unsupported $test
> +} else {
> +    gdb_assert { [string equal $filename /proc/${testpid}/exe] } $test
> +}
>   
>   # Cleanup.
>   kill_wait_spawned_process $test_spawn_id
> 
> base-commit: 85e370a3d63f88386e98b435f43fa63e9e54130b
diff mbox series

Patch

diff --git a/gdb/testsuite/gdb.base/attach-deleted-exec.exp b/gdb/testsuite/gdb.base/attach-deleted-exec.exp
index 3e31c36bcc4..11961153fe7 100644
--- a/gdb/testsuite/gdb.base/attach-deleted-exec.exp
+++ b/gdb/testsuite/gdb.base/attach-deleted-exec.exp
@@ -45,9 +45,27 @@  clean_restart
 
 # Attach.  GDB should spot that the executable is gone and fallback to
 # use /proc/PID/exe.
-gdb_test "attach $testpid" \
-    "Attaching to process $decimal\r\nReading symbols from /proc/${testpid}/exe\\.\\.\\..*" \
-    "attach to process with deleted executable"
+set test "attach to process with deleted executable"
+set re \
+    [multi_line \
+	 "Attaching to process $decimal" \
+	 "Reading symbols from (\[^\r\n\]+)[string_to_regexp ...]" \
+	 ".*"]
+set filename ""
+gdb_test_multiple "attach $testpid" $test {
+    -re -wrap $re {
+	set filename $expect_out(1,string)
+	pass $gdb_test_name
+    }
+}
+
+set test "filename /proc/PID/exe"
+set re_nfs \[^\r\n\]+[string_to_regexp /.nfs]\[^\r\n\]+
+if { [regexp $re_nfs $filename] } {
+    unsupported $test
+} else {
+    gdb_assert { [string equal $filename /proc/${testpid}/exe] } $test
+}
 
 # Cleanup.
 kill_wait_spawned_process $test_spawn_id