+2016-04-27 Simon Marchi <simon.marchi@ericsson.com>
+
+ * lib/gdb.exp (gdb_load_shlibs): Rename to...
+ (gdb_load_shlib): ... this.
+ * gdb.arch/ftrace-insn-reloc.exp: Adjust gdb_load_shlibs ->
+ gdb_load_shlib.
+ * gdb.base/catch-load.exp (one_catch_load_test): Likewise.
+ * gdb.base/ctxobj.exp: Likewise.
+ * gdb.base/dprintf-pending.exp: Likewise.
+ * gdb.base/dso2dso.exp: Likewise.
+ * gdb.base/fixsection.exp: Likewise.
+ * gdb.base/gcore-relro.exp: Likewise.
+ * gdb.base/gdb1555.exp: Likewise.
+ * gdb.base/global-var-nested-by-dso.exp: Likewise.
+ * gdb.base/gnu-ifunc.exp: Likewise.
+ * gdb.base/hbreak-in-shr-unsupported.exp: Likewise.
+ * gdb.base/jit-so.exp (one_jit_test): Likewise.
+ * gdb.base/pending.exp: Likewise.
+ * gdb.base/print-file-var.exp: Likewise.
+ * gdb.base/print-symbol-loading.exp: Likewise.
+ * gdb.base/shlib-call.exp: Likewise.
+ * gdb.base/shreloc.exp: Likewise.
+ * gdb.base/so-impl-ld.exp: Likewise.
+ * gdb.base/solib-disc.exp: Likewise.
+ * gdb.base/solib-nodir.exp: Likewise.
+ * gdb.base/solib-overlap.exp: Likewise.
+ * gdb.base/solib-symbol.exp: Likewise.
+ * gdb.base/solib-weak.exp (do_test): Likewise.
+ * gdb.base/sym-file.exp: Likewise.
+ * gdb.base/symtab-search-order.exp: Likewise.
+ * gdb.base/type-opaque.exp: Likewise.
+ * gdb.base/unload.exp: Likewise.
+ * gdb.base/watchpoint-solib.exp: Likewise.
+ * gdb.compile/compile.exp: Likewise.
+ * gdb.cp/gdb2384.exp: Likewise.
+ * gdb.cp/infcall-dlopen.exp: Likewise.
+ * gdb.cp/re-set-overloaded.exp: Likewise.
+ * gdb.fortran/library-module.exp: Likewise.
+ * gdb.opt/solib-intra-step.exp: Likewise.
+ * gdb.python/py-finish-breakpoint.exp: Likewise.
+ * gdb.python/py-shared.exp: Likewise.
+ * gdb.reverse/solib-precsave.exp: Likewise.
+ * gdb.reverse/solib-reverse.exp: Likewise.
+ * gdb.server/solib-list.exp: Likewise.
+ * gdb.threads/dlopen-libpthread.exp: Likewise.
+ * gdb.threads/tls-shared.exp: Likewise.
+ * gdb.threads/tls-so_extern.exp: Likewise.
+ * gdb.trace/change-loc.exp: Likewise.
+ * gdb.trace/ftrace-lock.exp: Likewise.
+ * gdb.trace/ftrace.exp: Likewise.
+ * gdb.trace/mi-tracepoint-changed.exp (test_reconnect): Likewise.
+ * gdb.trace/pending.exp: Likewise.
+ * gdb.trace/range-stepping.exp: Likewise.
+ * gdb.trace/strace.exp (strace_remove_socket): Likewise.
+ (strace_info_marker): Likewise.
+ (strace_probe_marker): Likewise.
+ (strace_trace_on_same_addr): Likewise.
+ (strace_trace_on_diff_addr): Likewise.
+ * gdb.trace/trace-break.exp: Likewise.
+ * gdb.trace/trace-condition.exp: Likewise.
+ * gdb.trace/trace-mt.exp: Likewise.
+
2016-04-27 Simon Marchi <simon.marchi@ericsson.com>
* lib/gdb.exp (gdb_load_shlibs): Accept a single argument. Return
}
set libipa [get_in_proc_agent]
-gdb_load_shlibs $libipa
+gdb_load_shlib $libipa
# Can't use prepare_for_testing, because that splits compiling into
# building objects and then linking, and we'd fail with "linker input
global decimal gdb_prompt
clean_restart $testfile
- gdb_load_shlibs $binfile2
+ gdb_load_shlib $binfile2
if {![runto_main]} {
fail "can't run to main"
}
clean_restart $executable
-gdb_load_shlibs $libobj1
-gdb_load_shlibs $libobj2
+gdb_load_shlib $libobj1
+gdb_load_shlib $libobj2
if ![runto_main] {
untested "could not run to main"
"single pending dprintf info"
gdb_load ${binfile}
- gdb_load_shlibs $lib_sl
+ gdb_load_shlib $lib_sl
gdb_run_cmd
}
clean_restart ${binfile}
-gdb_load_shlibs $lib_sl
+gdb_load_shlib $lib_sl
#
# Test setting, querying, and modifying pending breakpoints
}
clean_restart $binfile
-gdb_load_shlibs $binfile_libdso2
-gdb_load_shlibs $binfile_libdso1
+gdb_load_shlib $binfile_libdso2
+gdb_load_shlib $binfile_libdso1
if { ![runto_main] } {
return -1
gdb_start
gdb_reinitialize_dir $srcdir/$subdir
gdb_load ${binfile}
-gdb_load_shlibs ${lib_sl}
+gdb_load_shlib ${lib_sl}
if ![runto_main] then {
fail "Can't run to main"
}
clean_restart ${binfile}
-gdb_load_shlibs ${binfile_lib}
+gdb_load_shlib ${binfile_lib}
if ![runto lib] {
return -1
# Now restart gdb and load the corefile.
clean_restart ${binfile}
-gdb_load_shlibs ${binfile_lib}
+gdb_load_shlib ${binfile_lib}
gdb_test "core ${gcorefile}" "Core was generated by .*" "re-load generated corefile"
}
clean_restart ${binfile}
-gdb_load_shlibs $libobj
+gdb_load_shlib $libobj
if ![runto_main] then {
fail "Can't run to main"
}
clean_restart $binfile
-gdb_load_shlibs $binfile_lib1
-gdb_load_shlibs $binfile_lib2
+gdb_load_shlib $binfile_lib1
+gdb_load_shlib $binfile_lib2
if { ![runto_main] } {
return -1
# Start with a fresh gdb.
clean_restart $executable
-gdb_load_shlibs ${lib_so}
+gdb_load_shlib ${lib_so}
if ![runto_main] then {
fail "Can't run to main"
}
clean_restart $binfile
-gdb_load_shlibs $lib_so
+gdb_load_shlib $lib_so
if ![runto_main] then {
fail "Can't run to main"
global verbose testfile srcfile2 binfile2 binfile2_dlopen solib_binfile_target solib_binfile_test_msg
clean_restart $testfile
- gdb_load_shlibs $binfile2
+ gdb_load_shlib $binfile2
# This is just to help debugging when things fail
if {$verbose > 0} {
"single pending breakpoint info (without symbols)"
gdb_load ${binfile}
-gdb_load_shlibs $lib_sl
+gdb_load_shlib $lib_sl
set pendfunc1_loc [gdb_get_line_number "y = x + 4" ${libfile}.c]
gdb_reinitialize_dir $srcdir/$subdir
gdb_load ${binfile}
-gdb_load_shlibs $lib_sl
+gdb_load_shlib $lib_sl
#
# Test setting, querying, and modifying pending breakpoints
}
clean_restart $executable
-gdb_load_shlibs $libobj1
-gdb_load_shlibs $libobj2
+gdb_load_shlib $libobj1
+gdb_load_shlib $libobj2
if ![runto_main] {
untested "could not run to main"
}
clean_restart ${binfile}
-gdb_load_shlibs ${binfile_lib}
+gdb_load_shlib ${binfile_lib}
if ![runto lib] {
return -1
# Start with a fresh gdb.
clean_restart ${binfile}
-gdb_load_shlibs $lib1
-gdb_load_shlibs $lib2
+gdb_load_shlib $lib1
+gdb_load_shlib $lib2
gdb_test_no_output "set print sevenbit-strings"
gdb_test_no_output "set print address off"
# Start with a fresh gdb.
clean_restart $binfile
-gdb_load_shlibs $lib1_sl
-gdb_load_shlibs $lib2_sl
+gdb_load_shlib $lib1_sl
+gdb_load_shlib $lib2_sl
# Load up the shared objects
if ![runto_main] then {
# Start with a fresh gdb
clean_restart ${binfile}
-gdb_load_shlibs $lib_sl
+gdb_load_shlib $lib_sl
# This program implicitly loads SOM shared libraries.
#
gdb_start
gdb_reinitialize_dir $srcdir/$subdir
gdb_load ${binfile}
-gdb_load_shlibs $libobj
+gdb_load_shlib $libobj
if ![runto_main] then {
fail "Can't run to main"
}
clean_restart $executable
-gdb_load_shlibs ${binlibfile}
+gdb_load_shlib ${binlibfile}
gdb_test_no_output "set env LD_LIBRARY_PATH=:"
gdb_test "cd ${binlibfiledir}" "Working directory [string_to_regexp ${binlibfiledir}]\\." "cd OBJDIR/${subdir}"
clean_restart ${binfile_base}
# This testcase currently does not support remote targets.
- # gdb_load_shlibs ${binfile_lib1}
- # gdb_load_shlibs ${binfile_lib2}
+ # gdb_load_shlib ${binfile_lib1}
+ # gdb_load_shlib ${binfile_lib2}
# Here we should get:
# warning: .dynamic section for ".../solib-overlap-lib1.so" is not at the expected address (wrong library or version mismatch?)
gdb_start
gdb_reinitialize_dir $srcdir/$subdir
gdb_load ${binfile}
-gdb_load_shlibs $binfile_lib
+gdb_load_shlib $binfile_lib
# Set a breakpoint in the binary.
gdb_test "br foo2" \
gdb_start
gdb_reinitialize_dir $srcdir/$subdir
gdb_load ${binfile}
- gdb_load_shlibs $lib1
- gdb_load_shlibs $lib2
+ gdb_load_shlib $lib1
+ gdb_load_shlib $lib2
runto_main
return
}
-gdb_load_shlibs ${lib_so}
+gdb_load_shlib ${lib_so}
if ![runto_main] then {
fail "Can't run to main"
# Start with a fresh gdb.
clean_restart $binfile
-gdb_load_shlibs $lib1
+gdb_load_shlib $lib1
if ![runto_main] {
fail "Can't run to main"
}
clean_restart ${binfile}
-gdb_load_shlibs ${libobj}
+gdb_load_shlib ${libobj}
if ![runto_main] then {
fail "Can't run to main"
gdb_start
gdb_reinitialize_dir $srcdir/$subdir
gdb_load ${binfile}
-gdb_load_shlibs $lib_sl
-gdb_load_shlibs $lib_sl2
+gdb_load_shlib $lib_sl
+gdb_load_shlib $lib_sl2
#
# Test setting a breakpoint in a dynamically loaded library which is
gdb_start
gdb_reinitialize_dir $srcdir/$subdir
gdb_load ${binfile}
-gdb_load_shlibs $lib_sl
+gdb_load_shlib $lib_sl
runto_main
}
clean_restart $binfile
-gdb_load_shlibs $libbin
+gdb_load_shlib $libbin
if ![runto_main] {
return -1
}
clean_restart ${binfile}
-gdb_load_shlibs ${sofile}
+gdb_load_shlib ${sofile}
if ![runto_main] then {
return -1
}
-gdb_load_shlibs $libfile
+gdb_load_shlib $libfile
if { ![runto_main] } {
return -1
}
clean_restart $testfile
-gdb_load_shlibs ${sofile}
+gdb_load_shlib ${sofile}
gdb_test_no_output "set breakpoint pending yes"
gdb_test "break C::C" {Breakpoint [0-9]+ \(C::C\) pending\.} "break C::C"
clean_restart $testfile
-gdb_load_shlibs $libfile
+gdb_load_shlib $libfile
if ![runto MAIN__] then {
perror "couldn't run to breakpoint MAIN__"
}
clean_restart ${binfile}
-gdb_load_shlibs $binfile_lib
+gdb_load_shlib $binfile_lib
if ![runto_main] then {
return 0
#
clean_restart ${testfile}
-gdb_load_shlibs ${lib_sl}
+gdb_load_shlib ${lib_sl}
if ![runto_main] then {
fail "Cannot run to main."
#
clean_restart ${testfile}
-gdb_load_shlibs ${lib_sl}
+gdb_load_shlib ${lib_sl}
gdb_test "source $python_file" "Python script imported.*" \
"import python scripts"
#
clean_restart ${testfile}
-gdb_load_shlibs ${lib_sl}
+gdb_load_shlib ${lib_sl}
gdb_test "source $python_file" "Python script imported.*" \
"import python scripts"
#
clean_restart ${testfile}
-gdb_load_shlibs ${lib_sl}
+gdb_load_shlib ${lib_sl}
gdb_test "source $python_file" "Python script imported.*" \
"import python scripts"
#
clean_restart ${testfile}
-gdb_load_shlibs ${lib_sl}
+gdb_load_shlib ${lib_sl}
gdb_test "source $python_file" "Python script imported.*" \
"import python scripts"
#
clean_restart ${testfile}
-gdb_load_shlibs ${lib_sl}
+gdb_load_shlib ${lib_sl}
gdb_test "source $python_file" "Python script imported.*" \
"import python scripts"
# Start with a fresh gdb.
clean_restart $testfile
-gdb_load_shlibs ${library}
+gdb_load_shlib ${library}
# Skip all tests if Python scripting is not enabled.
if { [skip_python_tests] } { continue }
gdb_reinitialize_dir $srcdir/$subdir
gdb_load ${binfile}
-gdb_load_shlibs $library1
-gdb_load_shlibs $library2
+gdb_load_shlib $library1
+gdb_load_shlib $library2
runto main
gdb_reinitialize_dir $srcdir/$subdir
gdb_load ${binfile}
-gdb_load_shlibs $library1
-gdb_load_shlibs $library2
+gdb_load_shlib $library1
+gdb_load_shlib $library2
runto main
gdb_exit
gdb_start
gdb_reinitialize_dir $srcdir/$subdir
- gdb_load_shlibs ${binlibfile}
+ gdb_load_shlib ${binlibfile}
set remote_binfile [gdb_remote_download target $binfile]
|| [prepare_for_testing ${testfile}.exp ${executable} ${srcmainfile} {debug shlib_load}] } {
return -1
}
-gdb_load_shlibs $binfile_lib
+gdb_load_shlib $binfile_lib
if { ![runto_main] } {
return -1
clean_restart ${binfile}
-gdb_load_shlibs ${binfile_lib}
+gdb_load_shlib ${binfile_lib}
if ![runto_main] then {
fail "Can't run to main"
clean_restart ${binfile}
-gdb_load_shlibs ${binfile_lib}
+gdb_load_shlib ${binfile_lib}
if ![runto_main] then {
fail "Can't run to main"
clean_restart $executable
-gdb_load_shlibs $lib_sl1
-gdb_load_shlibs $lib_sl2
+gdb_load_shlib $lib_sl1
+gdb_load_shlib $lib_sl2
if ![runto_main] {
fail "Can't run to main to check for trace support"
# Re-compile test case with IPA.
set libipa [get_in_proc_agent]
-gdb_load_shlibs $libipa
+gdb_load_shlib $libipa
if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile executable \
[list debug nowarnings shlib=$libipa shlib=$lib_sl1 shlib_load] ] != "" } {
# Compile the test case with the in-process agent library.
set libipa [get_in_proc_agent]
-gdb_load_shlibs $libipa
+gdb_load_shlib $libipa
lappend options shlib=$libipa
}
set libipa [get_in_proc_agent]
-gdb_load_shlibs $libipa
+gdb_load_shlib $libipa
# Can't use prepare_for_testing, because that splits compiling into
# building objects and then linking, and we'd fail with "linker input
}
clean_restart $executable
- gdb_load_shlibs $lib_sl1
- gdb_load_shlibs $lib_sl2
+ gdb_load_shlib $lib_sl1
+ gdb_load_shlib $lib_sl2
if ![runto_main] then {
fail "Can't run to main"
return 0
clean_restart $executable
-gdb_load_shlibs $lib_sl1
-gdb_load_shlibs $lib_sl2
+gdb_load_shlib $lib_sl1
+gdb_load_shlib $lib_sl2
if ![runto_main] {
fail "Can't run to main to check for trace support"
clean_restart $executable
-gdb_load_shlibs $lib_sl1
-gdb_load_shlibs $lib_sl2
+gdb_load_shlib $lib_sl1
+gdb_load_shlib $lib_sl2
if ![runto_main] {
fail "Can't run to main to check for trace support"
# Re-compile test case with IPA.
set libipa [get_in_proc_agent]
-gdb_load_shlibs $libipa
+gdb_load_shlib $libipa
lappend exec_opts "shlib=$libipa"
range_stepping_with_tracepoint "trace"
set libipa [get_in_proc_agent]
-gdb_load_shlibs $libipa
+gdb_load_shlib $libipa
if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
executable [list debug nowarnings shlib=$libipa] ] != "" } {
# Restart with a fresh gdb.
clean_restart $executable
- gdb_load_shlibs $libipa
+ gdb_load_shlib $libipa
if ![runto_main] {
fail "Can't run to main"
return -1
# Restart with a fresh gdb.
clean_restart $executable
- gdb_load_shlibs $libipa
+ gdb_load_shlib $libipa
if ![runto_main] {
fail "Can't run to main"
return -1
# Restart with a fresh gdb.
clean_restart $executable
- gdb_load_shlibs $libipa
+ gdb_load_shlib $libipa
if ![runto_main] {
fail "Can't run to main"
return -1
# Restart with a fresh gdb.
clean_restart $executable
- gdb_load_shlibs $libipa
+ gdb_load_shlib $libipa
if ![runto_main] {
fail "Can't run to main"
return -1
# Restart with a fresh gdb.
clean_restart $executable
- gdb_load_shlibs $libipa
+ gdb_load_shlib $libipa
if ![runto_main] {
fail "Can't run to main"
return -1
}
clean_restart $executable
-gdb_load_shlibs $libipa
+gdb_load_shlib $libipa
if ![runto_main] {
fail "Can't run to main to check for trace support"
return -1
break_trace_same_addr_6 "trace" "disable" "trace" "enable"
set libipa [get_in_proc_agent]
-gdb_load_shlibs $libipa
+gdb_load_shlib $libipa
# Can't use prepare_for_testing, because that splits compiling into
# building objects and then linking, and we'd fail with "linker input
}
set libipa [get_in_proc_agent]
-gdb_load_shlibs $libipa
+gdb_load_shlib $libipa
# Can't use prepare_for_testing, because that splits compiling into
# building objects and then linking, and we'd fail with "linker input
step_over_tracepoint "trace"
set libipa [get_in_proc_agent]
-gdb_load_shlibs $libipa
+gdb_load_shlib $libipa
# Compile test case again with IPA.
if { [gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile \
}
}
-# gdb_load_shlibs LIB...
+# gdb_load_shlib LIB...
#
# Copy the listed library to the target.
-proc gdb_load_shlibs { file } {
+proc gdb_load_shlib { file } {
set dest [gdb_remote_download target [shlib_target_file $file]]
if {[is_remote target]} {