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

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 8070a74..6ed0407 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2011-11-30  Ulrich Weigand  <uweigand@de.ibm.com>
+
+       * 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.
+
 2011-11-29  Joel Brobecker  <brobecker@adacore.com>
 
        * gdb.base/infoline.c, gdb.base/infoline.exp: New files.

diff --git a/gdb/testsuite/gdb.base/solib-nodir.exp b/gdb/testsuite/gdb.base/solib-nodir.exp
index 04b96dc..690c725 100644 (file)
--- a/gdb/testsuite/gdb.base/solib-nodir.exp
+++ b/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
 }
 

diff --git a/gdb/testsuite/gdb.fortran/library-module.exp b/gdb/testsuite/gdb.fortran/library-module.exp
index 8c9f43c..f0754f5 100644 (file)
--- a/gdb/testsuite/gdb.fortran/library-module.exp
+++ b/gdb/testsuite/gdb.fortran/library-module.exp
@@ -34,13 +34,15 @@ if  { [gdb_compile_shlib "${srcdir}/${subdir}/${srclibfile}" $objdir/$subdir/$li
 # 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

diff --git a/gdb/testsuite/gdb.mi/mi-solib.exp b/gdb/testsuite/gdb.mi/mi-solib.exp
index 4344f96..014864a 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-solib.exp
+++ b/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"