From 8ed73e316466987d0d33ce9e21ebc8ff9aa4c4d7 Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Fri, 7 Oct 2022 16:17:34 +0200 Subject: [PATCH] [gdb/testsuite] Fix path in test name in gdb_load_shlib When running test-case gdb.server/solib-list.exp with target board remote-gdbserver-on-localhost, I run into: ... (gdb) set solib-search-path $outputs/gdb.server/solib-list^M (gdb) PASS: gdb.server/solib-list.exp: non-stop 0: \ set solib-search-path $outputs/gdb.server/solib-list PATH: gdb.server/solib-list.exp: non-stop 0: \ set solib-search-path $outputs/gdb.server/solib-list ... This is due to this code in gdb_load_shlib: ... gdb_test "set solib-search-path [file dirname $file]" "" "" ... Fix this by setting an explicit test name. Tested on x86_64-linux, with native and target boards remote-gdbserver-on-localhost, native-gdbserver and native-extended-gdbserver. --- gdb/testsuite/lib/gdb.exp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp index 432ed5e34ca..d60dceffd3f 100644 --- a/gdb/testsuite/lib/gdb.exp +++ b/gdb/testsuite/lib/gdb.exp @@ -5614,7 +5614,8 @@ proc gdb_load_shlib { file } { # We could set this even when not testing remotely, but a user # generally won't set it unless necessary. In order to make the tests # more like the real-life scenarios, we don't set it for local testing. - gdb_test "set solib-search-path [file dirname $file]" "" "" + gdb_test "set solib-search-path [file dirname $file]" "" \ + "set solib-search-path for [file tail $file]" } return $dest -- 2.30.2