* gdb.base/default.exp: Don't set match_max.

	* gdb.base/help.exp: Ditto.
	* gdb.base/list.exp: Ditto.
	* gdb.base/signals.exp: Ditto.

	* config/monitor.exp(gdb_load): If gdb,use_standard_load is
	set, use remote_ld to download the testcase instead of
	the GDB loader.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index a8f5334..229996f 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,14 @@
+Fri Mar  7 13:48:30 1997  Bob Manson  <manson@charmed.cygnus.com>
+
+       * gdb.base/default.exp: Don't set match_max.
+       * gdb.base/help.exp: Ditto.
+       * gdb.base/list.exp: Ditto.
+       * gdb.base/signals.exp: Ditto.
+
+       * config/monitor.exp(gdb_load): If gdb,use_standard_load is
+       set, use remote_ld to download the testcase instead of
+       the GDB loader.
+
 Wed Mar  5 00:00:43 1997  Bob Manson  <manson@charmed.cygnus.com>
 
        * config/vr5000.exp: New file.

diff --git a/gdb/testsuite/config/monitor.exp b/gdb/testsuite/config/monitor.exp
index 59f86f0..3fcee94 100644 (file)
--- a/gdb/testsuite/config/monitor.exp
+++ b/gdb/testsuite/config/monitor.exp
@@ -101,10 +101,28 @@ proc gdb_load { arg } {
     global timeout
 
     for { set j 1; } { $j <= 2 } {incr j; } {
+       if [target_info exists gdb,use_standard_load] {
+           gdb_test "target exec" "No exec file now." "" ".*Kill it.*y or n.*" "y"
+           remote_push_conn host;
+           set state [remote_ld target $arg];
+           remote_close target;
+           remote_pop_conn host;
+           if { $state != "pass" } {
+               perror "Couldn't load file into GDB."
+               return -1;
+           }
+           if { $arg != "" } {
+               if [gdb_file_cmd $arg] { return -1 }
+           }
+           gdb_target_monitor;
+           gdb_test "list main" ".*" ""
+           verbose "Loaded $arg into $GDB\n";
+           return 1;
+       }
+
        if { $arg != "" } {
            if [gdb_file_cmd $arg] { return -1 }
        }
-       
        gdb_target_monitor
 
        if [is_remote host] {