* gdb.base/catch-load.exp: Fix argument to gdb_load_shlibs.

* gdb.base/ctxobj.exp: Call gdb_load_shlibs.
	* gdb.base/print-file-var.exp: Likewise.
	* gdb.server/solib-list.exp: Skip on remote targets.

gdb/testsuite/ChangeLog

@@ -1,3 +1,10 @@
+2012-08-01  Ulrich Weigand  <ulrich.weigand@linaro.org>
+
+	* gdb.base/catch-load.exp: Fix argument to gdb_load_shlibs.
+	* gdb.base/ctxobj.exp: Call gdb_load_shlibs.
+	* gdb.base/print-file-var.exp: Likewise.
+	* gdb.server/solib-list.exp: Skip on remote targets.
+
 2012-08-01  Ulrich Weigand  <ulrich.weigand@linaro.org>
 
 	* gdb.base/watchpoint.exp (test_wide_location_1): Expect software

gdb/testsuite/gdb.base/catch-load.exp

@@ -47,12 +47,12 @@ if { [gdb_compile_shlib "${srcdir}/${subdir}/${srcfile2}" ${binfile2} {debug}] !
 # KIND is passed to the "catch" command.
 # MATCH is a boolean saying whether we expect the catchpoint to be hit.
 proc one_catch_load_test {scenario kind match sostop} { with_test_prefix "${scenario}" {
-    global verbose testfile testfile2 binfile2_dlopen
+    global verbose testfile testfile2 binfile2 binfile2_dlopen
     global srcfile
     global decimal gdb_prompt
 
     clean_restart $testfile
-    gdb_load_shlibs $binfile2_dlopen
+    gdb_load_shlibs $binfile2
 
     if {![runto_main]} {
 	fail "can't run to main"

gdb/testsuite/gdb.base/ctxobj.exp

@@ -51,6 +51,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${executable}.c" \
 }
 
 clean_restart $executable
+gdb_load_shlibs $libobj1 $libobj2
 
 if ![runto_main] {
     untested "could not run to main"

gdb/testsuite/gdb.base/print-file-var.exp

@@ -42,6 +42,7 @@ if { [gdb_compile "${srcdir}/${subdir}/${executable}.c" \
 }
 
 clean_restart $executable
+gdb_load_shlibs $libobj1 $libobj2
 
 if ![runto_main] {
     untested "could not run to main"

gdb/testsuite/gdb.server/solib-list.exp

@@ -27,6 +27,12 @@ if {[skip_gdbserver_tests] || [skip_shlib_tests]} {
     return
 }
 
+# This test case (currently) does not support remote targets, since it
+# assumes the ELF interpreter can be found on the host system
+if [is_remote target] then {
+    return
+}
+
 standard_testfile solib-list-main.c
 set srclibfile ${testfile}-lib.c
 set binlibfile [standard_output_file ${testfile}.so]