[09/11] gdb, testsuite: update attach-deleted-exec.exp to handle async messages
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
|
| linaro-tcwg-bot/tcwg_gdb_check--master-arm |
success
|
Test passed
|
Commit Message
From: "Bouhaouel, Mohamed" <mohamed.bouhaouel@intel.com>
With non-stop targets, async thread notifications can appear between
output lines during attach. Also, multiple "Reading symbols from"
messages are printed, so we need to specifically match the /proc/
path to capture the correct filename.
Output example on a non-stop remote target:
(gdb) attach 33604
Attaching to process 33604
[New Thread 33604.33604 (id 1)]
Reading symbols from /proc/33604/exe...
Reading symbols from /lib/x86_64-linux-gnu/libc.so.6...
Reading symbols from /usr/lib/debug/.build-id/8e/9fd827446c24067541ac5390e6f527fb5947bb.debug...
Reading symbols from /lib64/ld-linux-x86-64.so.2...
Reading symbols from /usr/lib/debug/.build-id/da/07864eb4c1b06504b8688d25d7e84759fe708d.debug...
[Switching to Thread 33604.33604]
0x00007c9166eeca7a in __GI___clock_nanosleep ...
---
.../gdb.base/attach-deleted-exec.exp | 59 +++++++++++--------
1 file changed, 34 insertions(+), 25 deletions(-)
@@ -45,26 +45,29 @@ clean_restart
# Attach. GDB should spot that the executable is gone and fallback to
# use /proc/PID/exe.
-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 attached_pid "no pid"
+gdb_test_multiple "attach $testpid" "attach to process with deleted executable" {
+ -re "Attaching to process $decimal\r\n" {
+ exp_continue
+ }
+ -re "\\\[New Thread \[^\r\n\]+\\\]\r\n" {
+ # Non-stop targets may emit async thread notifications.
+ exp_continue
+ }
+ -re "Reading symbols from /proc/($decimal)/exe[string_to_regexp ...]" {
+ set attached_pid $expect_out(1,string)
+ exp_continue
+ }
+ -re "Reading symbols from (\[^\r\n\]+[string_to_regexp /.nfs]\[^\r\n\]*)[string_to_regexp ...]" {
+ unsupported $gdb_test_name
+ return
+ }
+ -re "Reading symbols from \[^\r\n\]+[string_to_regexp ...]\r\n" {
+ exp_continue
+ }
+ -re -wrap "" {
+ gdb_assert { $attached_pid == $testpid } $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
}
# Restart GDB.
@@ -99,12 +102,18 @@ if { [target_info gdb_protocol] == "extended-remote" } {
verbose -log "APB: warning: No executable has been specified, and target executable $filename_re could not be found\\. Try using the \"file\" command\\."
-gdb_test "attach $testpid" \
- [multi_line \
- "Attaching to process $decimal" \
- "warning: No executable has been specified, and target executable $filename_re could not be found\\. Try using the \"file\" command\\." \
- ".*"] \
- "attach to inferior"
+gdb_test_multiple "attach $testpid" "attach to inferior" {
+ -re "Attaching to process $decimal\r\n" {
+ exp_continue
+ }
+ -re "\\\[New Thread \[^\r\n\]+\\\]\r\n" {
+ # Non-stop targets may emit async thread notifications.
+ exp_continue
+ }
+ -re -wrap "warning: No executable has been specified, and target executable $filename_re could not be found\\. Try using the \"file\" command\\..*" {
+ pass $gdb_test_name
+ }
+}
# Check GDB hasn't managed to load an executable.
gdb_test "info inferior" \