This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[commit] Fix dlopen tests for remote execution
- From: "Ulrich Weigand" <uweigand at de dot ibm dot com>
- To: gdb-patches at sourceware dot org
- Date: Thu, 4 Aug 2011 14:03:24 +0200 (CEST)
- Subject: [commit] Fix dlopen tests for remote execution
Hello,
a couple of recently added tests fail on a remote target, because they're
using dlopen in a way that assumes native execution. This patch fixes
gdb.cp/infcall-dlopen.exp and gdb.base/jit-so.exp to handle dlopen like
it is used in other tests: use gdb_load_shlibs to download the shared
library to the target, and then just use dlopen on the plain library
name, relying on the infrastructure to set up -rpath as required.
In addition, gdb.base/jit.exp and gdb.base/jit-so.exp have a shared
library that is not actually loaded via dlopen, but just accessed
directly via open/mmap. The patch explicitly uses gdb_download to
download it to the target and retrieve the file name that needs to
be used for this access.
Tested natively on i386-linux and remotely on arm-linux-gnueabi.
Committed to mainline.
Bye,
Ulrich
ChangeLog:
* gdb.base/jit.exp: Download solib_binfile to target.
* gdb.base/jit-so.exp: Likewise. Also, use gdb_load_shlibs
and call dlopen without full path name.
* gdb.cp/infcall-dlopen.exp: Use gdb_load_shlibs and call
dlopen without full path name.
Index: gdb/testsuite/gdb.base/jit-so.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/jit-so.exp,v
retrieving revision 1.1
diff -u -p -r1.1 jit-so.exp
--- gdb/testsuite/gdb.base/jit-so.exp 6 Jul 2011 21:40:17 -0000 1.1
+++ gdb/testsuite/gdb.base/jit-so.exp 4 Aug 2011 11:47:59 -0000
@@ -46,6 +46,7 @@ if { [gdb_compile "${srcdir}/${subdir}/
set testfile2 jit-main
set srcfile2 ${testfile2}.c
set binfile2 ${objdir}/${subdir}/${testfile2}.so
+set binfile2_dlopen [shlib_target_file ${testfile2}.so]
if { [gdb_compile_shlib "${srcdir}/${subdir}/${srcfile2}" ${binfile2} {debug additional_flags="-DMAIN=jit_dl_main"}] != "" } {
untested jit.exp
return -1
@@ -54,7 +55,7 @@ if { [gdb_compile_shlib "${srcdir}/${sub
set solib_testfile "jit-solib"
set solib_srcfile "${srcdir}/${subdir}/${solib_testfile}.c"
set solib_binfile "${objdir}/${subdir}/${solib_testfile}.so"
-set solib_binfile_test_msg "OBJDIR/${subdir}/${solib_testfile}.so"
+set solib_binfile_test_msg "SHLIBDIR/${solib_testfile}.so"
# Note: compiling without debug info: the library goes through symbol
# renaming by munging on its symbol table, and that wouldn't work for .debug
@@ -64,13 +65,16 @@ if { [gdb_compile_shlib ${solib_srcfile}
return -1
}
+set solib_binfile_target [gdb_download ${solib_binfile}]
+
proc one_jit_test {count match_str} {
- global verbose testfile srcfile2 binfile2 solib_binfile solib_binfile_test_msg pf_prefix
+ global verbose testfile srcfile2 binfile2 binfile2_dlopen solib_binfile_target solib_binfile_test_msg pf_prefix
set old_pf_prefix $pf_prefix
set pf_prefix "one_jit_test-$count"
clean_restart $testfile
+ gdb_load_shlibs $binfile2
# This is just to help debugging when things fail
if {$verbose > 0} {
@@ -86,7 +90,7 @@ proc one_jit_test {count match_str} {
gdb_continue_to_breakpoint "break here before-dlopen"
# Poke desired values directly into inferior instead of using "set args"
# because "set args" does not work under gdbserver.
- gdb_test_no_output "set var jit_libname = \"$binfile2\""
+ gdb_test_no_output "set var jit_libname = \"$binfile2_dlopen\""
gdb_breakpoint [gdb_get_line_number "break here after-dlopen" ]
gdb_continue_to_breakpoint "break here after-dlopen"
@@ -95,7 +99,7 @@ proc one_jit_test {count match_str} {
gdb_continue_to_breakpoint "break here 0"
gdb_test_no_output "set var argc = 2"
- gdb_test_no_output "set var libname = \"$solib_binfile\"" "set var libname = \"$solib_binfile_test_msg\""
+ gdb_test_no_output "set var libname = \"$solib_binfile_target\"" "set var libname = \"$solib_binfile_test_msg\""
gdb_test_no_output "set var count = $count"
gdb_breakpoint "$srcfile2:[gdb_get_line_number {break here 1} $srcfile2]"
Index: gdb/testsuite/gdb.base/jit.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/jit.exp,v
retrieving revision 1.2
diff -u -p -r1.2 jit.exp
--- gdb/testsuite/gdb.base/jit.exp 7 Feb 2011 13:35:42 -0000 1.2
+++ gdb/testsuite/gdb.base/jit.exp 4 Aug 2011 11:47:59 -0000
@@ -43,7 +43,7 @@ if { [gdb_compile "${srcdir}/${subdir}/
set solib_testfile "jit-solib"
set solib_srcfile "${srcdir}/${subdir}/${solib_testfile}.c"
set solib_binfile "${objdir}/${subdir}/${solib_testfile}.so"
-set solib_binfile_test_msg "OBJDIR/${subdir}/${solib_testfile}.so"
+set solib_binfile_test_msg "SHLIBDIR/${solib_testfile}.so"
# Note: compiling without debug info: the library goes through symbol
# renaming by munging on its symbol table, and that wouldn't work for .debug
@@ -53,8 +53,10 @@ if { [gdb_compile_shlib ${solib_srcfile}
return -1
}
+set solib_binfile_target [gdb_download ${solib_binfile}]
+
proc one_jit_test {count match_str} {
- global verbose testfile solib_binfile solib_binfile_test_msg pf_prefix
+ global verbose testfile solib_binfile_target solib_binfile_test_msg pf_prefix
set old_pf_prefix $pf_prefix
set pf_prefix "one_jit_test-$count"
@@ -77,7 +79,7 @@ proc one_jit_test {count match_str} {
# Poke desired values directly into inferior instead of using "set args"
# because "set args" does not work under gdbserver.
gdb_test_no_output "set var argc = 2"
- gdb_test_no_output "set var libname = \"$solib_binfile\"" "set var libname = \"$solib_binfile_test_msg\""
+ gdb_test_no_output "set var libname = \"$solib_binfile_target\"" "set var libname = \"$solib_binfile_test_msg\""
gdb_test_no_output "set var count = $count"
gdb_breakpoint [gdb_get_line_number "break here 1"]
Index: gdb/testsuite/gdb.cp/infcall-dlopen.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.cp/infcall-dlopen.exp,v
retrieving revision 1.2
diff -u -p -r1.2 infcall-dlopen.exp
--- gdb/testsuite/gdb.cp/infcall-dlopen.exp 1 Jan 2011 15:33:43 -0000 1.2
+++ gdb/testsuite/gdb.cp/infcall-dlopen.exp 4 Aug 2011 11:47:59 -0000
@@ -27,6 +27,7 @@ set srclibfile ${testfile}-lib.cc
set executable ${testfile}
set libfile ${objdir}/${subdir}/${executable}.so
set binfile ${objdir}/${subdir}/${executable}
+set lib_dlopen [shlib_target_file ${executable}.so]
# Use completely arbitrary file for $libfile source.
if { [gdb_compile_shlib ${srcdir}/${subdir}/${srclibfile} ${libfile} {debug c++}] != ""
@@ -34,12 +35,14 @@ if { [gdb_compile_shlib ${srcdir}/${subd
return -1
}
+gdb_load_shlibs $libfile
+
if { ![runto_main] } {
return -1
}
for {set i 0} {$i < 10} {incr i} {
- gdb_test "p openlib (\"${libfile}\")" " = 1" "test $i"
+ gdb_test "p openlib (\"${lib_dlopen}\")" " = 1" "test $i"
# Try to exploit the GDB trashed memory.
gdb_test "b openlib" {Breakpoint [0-9]+ at .*} "test $i stub 1"
gdb_test_no_output {delete $bpnum} "test $i stub 2"
--
Dr. Ulrich Weigand
GNU Toolchain for Linux on System z and Cell BE
Ulrich.Weigand@de.ibm.com