[committed,gdb/testsuite] Expect conformation question in gdb.server/solib-list.exp

Message ID 4f48c0bc-de5d-77e8-7b4b-d4a800ce00ab@suse.de
State New
Headers show
Series
  • [committed,gdb/testsuite] Expect conformation question in gdb.server/solib-list.exp
Related show

Commit Message

Tom de Vries June 29, 2020, 9:03 a.m.
[ was:  Re: [Bug gdb/25475] FAIL: gdb.server/solib-list.exp: non-stop
0/1: target remote (got interactive prompt) ]

On 6/28/20 6:37 PM, Philippe Waroquiers wrote:
> On Sun, 2020-06-28 at 12:19 +0200, Tom de Vries wrote:

> Hello Tom,

> 

>> Hi Philippe,

>>

>> commit 6b9374f1 added answering the load question, if asked.  I'm not

>> sure I understand what change you're suggesting here.

> Now, the question should always be asked, so the "if asked" could be removed.

> 


I see, committed as attached.

Thanks,
- Tom

Patch

[gdb/testsuite] Expect conformation question in gdb.server/solib-list.exp

Before commit a8654e7d78 'Fixes PR 25475: ensure exec-file-mismatch "ask"
always asks in case of mismatch', there was a difference in behaviour in
test-case gdb.server/solib-list.exp.

If the executable did not contain debug info (as is usually the case), gdb
would detect a mismatch but not ask for confirmation:
...
(gdb) target remote localhost:2346^M
Remote debugging using localhost:2346^M
warning: Mismatch between current exec-file solib-list^M
and automatically determined exec-file /lib64/ld-2.26.so^M
exec-file-mismatch handling is currently "ask"^M
Reading symbols from /lib64/ld-2.26.so...^M
Reading symbols from /usr/lib/debug/lib64/ld-2.26.so.debug...^M
0x00007ffff7dd7ea0 in _start () at rtld.c:745^M
745     }^M
(gdb) PASS: gdb.server/solib-list.exp: non-stop 0: target remote
...

If the executable did contain debug info (as happens to be the case for
openSUSE), gdb would detect a mismatch and ask for confirmation:
...
(gdb) PASS: gdb.server/solib-list.exp: non-stop 0: file binfile
target remote localhost:2346^M
Remote debugging using localhost:2346^M
warning: Mismatch between current exec-file solib-list^M
and automatically determined exec-file /lib64/ld-2.26.so^M
exec-file-mismatch handling is currently "ask"^M
Load new symbol table from "/lib64/ld-2.26.so"? (y or n) y^M
Reading symbols from /lib64/ld-2.26.so...^M
Reading symbols from /usr/lib/debug/lib64/ld-2.26.so.debug...^M
0x00007ffff7dd7ea0 in _start () at rtld.c:745^M
745     }^M
(gdb) PASS: gdb.server/solib-list.exp: non-stop 0: target remote
...

After commit a8654e7d78, the confirmation is now also asked in case there's
no debug info.

Tighten the test-case by verifying that the confirmation question is asked, as
suggested in the log message of commit a8654e7d78:
...
we can remove the bypass introduced by Tom in 6b9374f1, in order to always
answer to the 'load' question.
...

gdb/testsuite/ChangeLog:

2020-06-29  Tom de Vries  <tdevries@suse.de>

	PR gdb/25475
	* gdb.server/solib-list.exp: Verify that the symbol reload
	confirmation question is asked.

---
 gdb/testsuite/gdb.server/solib-list.exp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/gdb/testsuite/gdb.server/solib-list.exp b/gdb/testsuite/gdb.server/solib-list.exp
index 6f077c6a66..a326f940ad 100644
--- a/gdb/testsuite/gdb.server/solib-list.exp
+++ b/gdb/testsuite/gdb.server/solib-list.exp
@@ -93,12 +93,14 @@  foreach nonstop { 0 1 } { with_test_prefix "non-stop $nonstop" {
 
     set test "target $gdbserver_protocol"
     set ok 0
+    set new_symbol_table 0
     gdb_test_multiple "target $gdbserver_protocol $gdbserver_gdbport" $test {
 	-re "Remote debugging using" {
 	    set ok 1
 	    exp_continue
 	}
 	-re {.*Load new symbol table from ".*"\? \(y or n\) } {
+	    set new_symbol_table 1
 	    send_gdb "y\n" answer
 	    exp_continue
 	}
@@ -111,6 +113,7 @@  foreach nonstop { 0 1 } { with_test_prefix "non-stop $nonstop" {
 	    }
 	}
     }
+    gdb_assert {$new_symbol_table == 1}
 
     gdb_test "continue" "Program received signal SIGUSR1, .*"
     gdb_test "sharedlibrary" ".*"