* lib/mi-support.exp (mi_load_shlibs): New.

	* gdb.mi/mi-pending.exp: Use mi_load_shlibs, not gdb_load_shlibs.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 8c213dd..603bc9e 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-31  Vladimir Prus  <vladimir@codesourcery.com>
+
+       * lib/mi-support.exp (mi_load_shlibs): New.
+       * gdb.mi/mi-pending.exp: Use mi_load_shlibs, not gdb_load_shlibs.
+
 2008-07-30  Vladimir Prus  <vladimir@codesourcery.com>
 
        * lib/mi-support.exp (get_mi_thread_list)

diff --git a/gdb/testsuite/gdb.mi/mi-pending.exp b/gdb/testsuite/gdb.mi/mi-pending.exp
index 5e5096f..f5b1989 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-pending.exp
+++ b/gdb/testsuite/gdb.mi/mi-pending.exp
@@ -56,7 +56,7 @@ gdb_exit
 mi_gdb_start
 mi_gdb_reinitialize_dir $srcdir/$subdir
 mi_gdb_load ${binfile}
-gdb_load_shlibs $lib_sl
+mi_load_shlibs $lib_sl
 
 if [target_info exists gdb_stub] {
     gdb_step_for_stub;

diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp
index d6ec624..91e5b09 100644 (file)
--- a/gdb/testsuite/lib/mi-support.exp
+++ b/gdb/testsuite/lib/mi-support.exp
@@ -1681,3 +1681,18 @@ proc check_mi_and_console_threads {name} {
     }
   }
 }
+
+proc mi_load_shlibs { args } {
+    if {![is_remote target]} {
+       return
+    }
+
+    foreach file $args {
+       gdb_download $file
+    }
+
+    # Even if the target supplies full paths for shared libraries,
+    # they may not be paths for this system.
+    mi_gdb_test "set solib-search-path [file dirname [lindex $args 0]]" "\^done" ""
+}
+