[testsuite, commit+7.5] Fix new failures in remote testing

["Ulrich Weigand" <uweigand at de dot ibm dot com>]

Hello,

remote testing uncovered a couple of recently added shared-library related
tests that fail remotely.  In most cases this was due to gdb_load_shlibs
not being called (or being called with the wrong argument).

gdb.server/solib-list.exp cannot work in remote testing as-is, since it
assumes the ELF interpreter binary can be found on the host.  I've
simply disabled the test for remote targets for now.

Tested on arm-linux-gnueabi.
Committed to mainline and 7.5 branch.

Bye,
Ulrich


ChangeLog:

	* 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.


Index: gdb/testsuite/gdb.base/catch-load.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/catch-load.exp,v
retrieving revision 1.5
diff -u -p -r1.5 catch-load.exp
--- gdb/testsuite/gdb.base/catch-load.exp	21 Jun 2012 20:46:21 -0000	1.5
+++ gdb/testsuite/gdb.base/catch-load.exp	31 Jul 2012 17:07:33 -0000
@@ -47,12 +47,12 @@ if { [gdb_compile_shlib "${srcdir}/${sub
 # 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"
Index: gdb/testsuite/gdb.base/ctxobj.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/ctxobj.exp,v
retrieving revision 1.2
diff -u -p -r1.2 ctxobj.exp
--- gdb/testsuite/gdb.base/ctxobj.exp	5 Jun 2012 13:50:31 -0000	1.2
+++ gdb/testsuite/gdb.base/ctxobj.exp	31 Jul 2012 17:07:34 -0000
@@ -51,6 +51,7 @@ if { [gdb_compile "${srcdir}/${subdir}/$
 }
 
 clean_restart $executable
+gdb_load_shlibs $libobj1 $libobj2
 
 if ![runto_main] {
     untested "could not run to main"
Index: gdb/testsuite/gdb.base/print-file-var.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/print-file-var.exp,v
retrieving revision 1.2
diff -u -p -r1.2 print-file-var.exp
--- gdb/testsuite/gdb.base/print-file-var.exp	5 Jun 2012 13:50:31 -0000	1.2
+++ gdb/testsuite/gdb.base/print-file-var.exp	31 Jul 2012 17:07:34 -0000
@@ -42,6 +42,7 @@ if { [gdb_compile "${srcdir}/${subdir}/$
 }
 
 clean_restart $executable
+gdb_load_shlibs $libobj1 $libobj2
 
 if ![runto_main] {
     untested "could not run to main"
Index: gdb/testsuite/gdb.server/solib-list.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.server/solib-list.exp,v
retrieving revision 1.3
diff -u -p -r1.3 solib-list.exp
--- gdb/testsuite/gdb.server/solib-list.exp	25 Jun 2012 19:46:26 -0000	1.3
+++ gdb/testsuite/gdb.server/solib-list.exp	31 Jul 2012 17:07:34 -0000
@@ -27,6 +27,12 @@ if {[skip_gdbserver_tests] || [skip_shli
     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]
-- 
  Dr. Ulrich Weigand
  GNU Toolchain for Linux on System z and Cell BE
  Ulrich.Weigand@de.ibm.com