[commit] Fix some more solib tests for remote testing

[commit] Fix some more solib tests for remote testing

[Ulrich Weigand]

Hello,

I've noticed a couple of more failures in shared library tests when
doing remote testing, because the tests were not using the appropriate
testsuite library routines.

Fixed by the patch below.  Tested on s390x-ibm-linux.
Committed to mainline.

Bye,
Ulrich


ChangeLog:

	* gdb.base/solib-nodir.exp: Skip if remote target.
	* gdb.base/gdb.fortran.exp: Use shlib= flag when linking main
	application.  Call gdb_load_shlibs.
	* gdb.mi/mi-solib.exp: Use mi_load_shlibs instead of gdb_load_shlibs.


Index: gdb-head/gdb/testsuite/gdb.base/solib-nodir.exp
===================================================================
--- gdb-head.orig/gdb/testsuite/gdb.base/solib-nodir.exp
+++ gdb-head/gdb/testsuite/gdb.base/solib-nodir.exp
@@ -14,7 +14,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 # are we on a target board
-if {![isnative] || [skip_shlib_tests]} {
+if {[is_remote target] || [skip_shlib_tests]} {
     return
 }
 
Index: gdb-head/gdb/testsuite/gdb.fortran/library-module.exp
===================================================================
--- gdb-head.orig/gdb/testsuite/gdb.fortran/library-module.exp
+++ gdb-head/gdb/testsuite/gdb.fortran/library-module.exp
@@ -34,13 +34,15 @@ if  { [gdb_compile_shlib "${srcdir}/${su
 # just for the linking phase (and not the source compilation phase).  And any
 # warnings on ignored $libfile abort the process.
 
-if  { [gdb_compile [list $srcdir/$subdir/$srcfile $objdir/$subdir/$libfile] $objdir/$subdir/$binfile executable {debug f90}] != "" } {
+if  { [gdb_compile $srcdir/$subdir/$srcfile $objdir/$subdir/$binfile executable [list debug f90 shlib=$objdir/$subdir/$libfile]] != "" } {
     untested "Couldn't compile ${srcfile}"
     return -1
 }
 
 clean_restart $binfile
 
+gdb_load_shlibs $objdir/$subdir/$libfile
+
 if ![runto MAIN__] then {
     perror "couldn't run to breakpoint MAIN__"
     continue
Index: gdb-head/gdb/testsuite/gdb.mi/mi-solib.exp
===================================================================
--- gdb-head.orig/gdb/testsuite/gdb.mi/mi-solib.exp
+++ gdb-head/gdb/testsuite/gdb.mi/mi-solib.exp
@@ -51,7 +51,7 @@ mi_gdb_reinitialize_dir $srcdir/$subdir
 mi_gdb_reinitialize_dir $srcdir/$subdir
 mi_gdb_load ${binfile}
 
-gdb_load_shlibs $binfile_lib
+mi_load_shlibs $binfile_lib
 
 mi_gdb_test "777-gdb-set stop-on-solib-events 1" "777\\^done" \
     "set stop-on-solib-events"
-- 
  Dr. Ulrich Weigand
  GNU Toolchain for Linux on System z and Cell BE
  Ulrich.Weigand@de.ibm.com