* lib/insight-support.exp (gdbtk_start): Figure out where

        the insight executable is based on where gdb is. Use this
        executable to start insight instead of gdb.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index ab6cceaed9c2e9e26f58957695be510668c794a2..6cc897bfbba904d93cb647989a11160de57281b9 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2002-09-26  Keith Seitz  <keiths@redhat.com>
+
+       * lib/insight-support.exp (gdbtk_start): Figure out where
+       the insight executable is based on where gdb is. Use this
+       executable to start insight instead of gdb.
+
 2002-09-25  Andrew Cagney  <cagney@redhat.com>
 
        * gdb.base/pc-fp.exp, gdb.base/pc-fp.c: New test.

diff --git a/gdb/testsuite/lib/insight-support.exp b/gdb/testsuite/lib/insight-support.exp
index 42d14a9a27a72e4c481edee2d5ca0676237b2485..cbdf163c85f290f2fdced0bab58d1673b79ec34a 100644 (file)
--- a/gdb/testsuite/lib/insight-support.exp
+++ b/gdb/testsuite/lib/insight-support.exp
@@ -54,7 +54,15 @@ proc gdbtk_start {test} {
 
   gdb_stop_suppressing_tests;
 
-  verbose "Starting $GDB -nx -q --tclcommand=$test"
+  # Need to convert ::GDB to use (-)?insight...
+  if {[regsub {gdb$} $GDB insight newGDB]} {
+    set INSIGHT $newGDB
+  } else {
+    perror "Cannot find Insight executable"
+    exit 1
+  }
+
+  verbose "Starting $INSIGHT -nx -q --tclcommand=$test"
 
   set real_test [which $test]
   if {$real_test == 0} {
@@ -63,8 +71,8 @@ proc gdbtk_start {test} {
   }
 
   if {![is_remote host]} {
-    if { [which $GDB] == 0 } {
-      perror "$GDB does not exist."
+    if { [which $INSIGHT] == 0 } {
+      perror "$INSIGHT does not exist."
       exit 1
     }
   }
@@ -91,9 +99,9 @@ proc gdbtk_start {test} {
   set env(GDBTK_VERBOSE) 1
   set env(GDBTK_LOGFILE) [to_tcl_path [file join $objdir gdb.log]]
 
-  set err [catch {exec $GDB -nx -q --tclcommand=$test} res]
+  set err [catch {exec $INSIGHT -nx -q --tclcommand=$test} res]
   if { $err } {
-    perror "Execing $GDB failed: $res"
+    perror "Execing $INSIGHT failed: $res"
     append res "\nERROR gdb-crash"
   }
   return $res