Recognize -i=mi0, -i=mi1 and -i=mi.

37 files changed, 50 insertions, 0 deletions

diff --git a/gdb/testsuite/gdb.mi/ChangeLog-mi b/gdb/testsuite/gdb.mi/ChangeLog-mi
index 4349d09..0c1e353 100644
--- a/gdb/testsuite/gdb.mi/ChangeLog-mi
+++ b/gdb/testsuite/gdb.mi/ChangeLog-mi
@@ -1,3 +1,17 @@
+2001-06-18  Andrew Cagney  <ac131313@redhat.com>
+
+	* mi-basics.exp, mi-break.exp, mi-console.exp, mi-disassemble.exp,
+	mi-eval.exp, mi-hack-cli.exp, mi-read-memory.exp, mi-regs.exp,
+	mi-return.exp, mi-simplerun.exp, mi-stack.exp, mi-stepi.exp,
+	mi-until.exp, mi-var-block.exp, mi-var-child.exp, mi-var-cmd.exp,
+	mi-var-display.exp, mi-watch.exp, mi0-basics.exp, mi0-break.exp,
+	mi0-console.exp, mi0-disassemble.exp, mi0-eval.exp,
+	mi0-hack-cli.exp, mi0-read-memory.exp, mi0-regs.exp,
+	mi0-return.exp, mi0-simplerun.exp, mi0-stack.exp, mi0-stepi.exp,
+	mi0-until.exp, mi0-var-block.exp, mi0-var-child.exp,
+	mi0-var-cmd.exp, mi0-var-display.exp, mi0-watch.exp: Use MIFLAGS
+	to explictly select an interpreter.
+
 2001-06-16  Andrew Cagney  <ac131313@redhat.com>
 
 	MI0 was the never enabled MI interface included in GDB 5.0.
diff --git a/gdb/testsuite/gdb.mi/mi-basics.exp b/gdb/testsuite/gdb.mi/mi-basics.exp
index 41ce792..85d9924 100644
--- a/gdb/testsuite/gdb.mi/mi-basics.exp
+++ b/gdb/testsuite/gdb.mi/mi-basics.exp
@@ -30,6 +30,7 @@
 #
 
 load_lib mi-support.exp
+set MIFLAGS "-i=mi"
 
 gdb_exit
 if [mi_gdb_start] {
diff --git a/gdb/testsuite/gdb.mi/mi-break.exp b/gdb/testsuite/gdb.mi/mi-break.exp
index 8ac38ea..d2df948 100644
--- a/gdb/testsuite/gdb.mi/mi-break.exp
+++ b/gdb/testsuite/gdb.mi/mi-break.exp
@@ -29,6 +29,7 @@
 #
 
 load_lib mi-support.exp
+set MIFLAGS "-i=mi"
 
 gdb_exit
 if [mi_gdb_start] {
diff --git a/gdb/testsuite/gdb.mi/mi-console.exp b/gdb/testsuite/gdb.mi/mi-console.exp
index 04ee841..7b7a706 100644
--- a/gdb/testsuite/gdb.mi/mi-console.exp
+++ b/gdb/testsuite/gdb.mi/mi-console.exp
@@ -33,6 +33,7 @@
 # remote target.
 
 load_lib mi-support.exp
+set MIFLAGS "-i=mi"
 
 gdb_exit
 if [mi_gdb_start] {
diff --git a/gdb/testsuite/gdb.mi/mi-disassemble.exp b/gdb/testsuite/gdb.mi/mi-disassemble.exp
index 75f097d..a1325d6f 100644
--- a/gdb/testsuite/gdb.mi/mi-disassemble.exp
+++ b/gdb/testsuite/gdb.mi/mi-disassemble.exp
@@ -25,6 +25,7 @@
 #
 
 load_lib mi-support.exp
+set MIFLAGS "-i=mi"
 
 gdb_exit
 if [mi_gdb_start] {
diff --git a/gdb/testsuite/gdb.mi/mi-eval.exp b/gdb/testsuite/gdb.mi/mi-eval.exp
index 542d31d..780605b 100644
--- a/gdb/testsuite/gdb.mi/mi-eval.exp
+++ b/gdb/testsuite/gdb.mi/mi-eval.exp
@@ -27,6 +27,7 @@
 #
 
 load_lib mi-support.exp
+set MIFLAGS "-i=mi"
 
 gdb_exit
 if [mi_gdb_start] {
diff --git a/gdb/testsuite/gdb.mi/mi-hack-cli.exp b/gdb/testsuite/gdb.mi/mi-hack-cli.exp
index 44b7ff3..98ee504 100644
--- a/gdb/testsuite/gdb.mi/mi-hack-cli.exp
+++ b/gdb/testsuite/gdb.mi/mi-hack-cli.exp
@@ -21,6 +21,7 @@
 # Some basic checks for the CLI.
 
 load_lib mi-support.exp
+set MIFLAGS "-i=mi"
 
 gdb_exit
 if [mi_gdb_start] {
diff --git a/gdb/testsuite/gdb.mi/mi-read-memory.exp b/gdb/testsuite/gdb.mi/mi-read-memory.exp
index 871b129..a7b2a1a 100644
--- a/gdb/testsuite/gdb.mi/mi-read-memory.exp
+++ b/gdb/testsuite/gdb.mi/mi-read-memory.exp
@@ -30,6 +30,7 @@
 #
 
 load_lib mi-support.exp
+set MIFLAGS "-i=mi"
 
 gdb_exit
 if [mi_gdb_start] {
diff --git a/gdb/testsuite/gdb.mi/mi-regs.exp b/gdb/testsuite/gdb.mi/mi-regs.exp
index 089b767..808c087 100644
--- a/gdb/testsuite/gdb.mi/mi-regs.exp
+++ b/gdb/testsuite/gdb.mi/mi-regs.exp
@@ -27,6 +27,7 @@
 
 
 load_lib mi-support.exp
+set MIFLAGS "-i=mi"
 
 gdb_exit
 if [mi_gdb_start] {
diff --git a/gdb/testsuite/gdb.mi/mi-return.exp b/gdb/testsuite/gdb.mi/mi-return.exp
index 57ea05e..81680a4 100644
--- a/gdb/testsuite/gdb.mi/mi-return.exp
+++ b/gdb/testsuite/gdb.mi/mi-return.exp
@@ -27,6 +27,7 @@
 #
 
 load_lib mi-support.exp
+set MIFLAGS "-i=mi"
 
 gdb_exit
 if [mi_gdb_start] {
diff --git a/gdb/testsuite/gdb.mi/mi-simplerun.exp b/gdb/testsuite/gdb.mi/mi-simplerun.exp
index 636f60d..d5b528d 100644
--- a/gdb/testsuite/gdb.mi/mi-simplerun.exp
+++ b/gdb/testsuite/gdb.mi/mi-simplerun.exp
@@ -29,6 +29,7 @@
 #
 
 load_lib mi-support.exp
+set MIFLAGS "-i=mi"
 
 gdb_exit
 if [mi_gdb_start] {
diff --git a/gdb/testsuite/gdb.mi/mi-stack.exp b/gdb/testsuite/gdb.mi/mi-stack.exp
index 045e981..1ec987a 100644
--- a/gdb/testsuite/gdb.mi/mi-stack.exp
+++ b/gdb/testsuite/gdb.mi/mi-stack.exp
@@ -27,6 +27,7 @@
 #
 
 load_lib mi-support.exp
+set MIFLAGS "-i=mi"
 
 gdb_exit
 if [mi_gdb_start] {
diff --git a/gdb/testsuite/gdb.mi/mi-stepi.exp b/gdb/testsuite/gdb.mi/mi-stepi.exp
index a67d742..23387d4 100644
--- a/gdb/testsuite/gdb.mi/mi-stepi.exp
+++ b/gdb/testsuite/gdb.mi/mi-stepi.exp
@@ -27,6 +27,7 @@
 #
 
 load_lib mi-support.exp
+set MIFLAGS "-i=mi"
 
 gdb_exit
 if [mi_gdb_start] {
diff --git a/gdb/testsuite/gdb.mi/mi-until.exp b/gdb/testsuite/gdb.mi/mi-until.exp
index cf3c21d..13c73e3 100644
--- a/gdb/testsuite/gdb.mi/mi-until.exp
+++ b/gdb/testsuite/gdb.mi/mi-until.exp
@@ -27,6 +27,7 @@
 #
 
 load_lib mi-support.exp
+set MIFLAGS "-i=mi"
 
 gdb_exit
 if [mi_gdb_start] {
diff --git a/gdb/testsuite/gdb.mi/mi-var-block.exp b/gdb/testsuite/gdb.mi/mi-var-block.exp
index 539a58d..0b9ebc3 100644
--- a/gdb/testsuite/gdb.mi/mi-var-block.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-block.exp
@@ -24,6 +24,7 @@
 
 
 load_lib mi-support.exp
+set MIFLAGS "-i=mi"
 
 gdb_exit
 if [mi_gdb_start] {
diff --git a/gdb/testsuite/gdb.mi/mi-var-child.exp b/gdb/testsuite/gdb.mi/mi-var-child.exp
index 6ac6e6b..1d77df5 100644
--- a/gdb/testsuite/gdb.mi/mi-var-child.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-child.exp
@@ -24,6 +24,7 @@
 
 
 load_lib mi-support.exp
+set MIFLAGS "-i=mi"
 
 gdb_exit
 if [mi_gdb_start] {
diff --git a/gdb/testsuite/gdb.mi/mi-var-cmd.exp b/gdb/testsuite/gdb.mi/mi-var-cmd.exp
index f1fcedd..a9ae101 100644
--- a/gdb/testsuite/gdb.mi/mi-var-cmd.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-cmd.exp
@@ -24,6 +24,7 @@
 
 
 load_lib mi-support.exp
+set MIFLAGS "-i=mi"
 
 gdb_exit
 if [mi_gdb_start] {
diff --git a/gdb/testsuite/gdb.mi/mi-var-display.exp b/gdb/testsuite/gdb.mi/mi-var-display.exp
index 4f231d0..f57280b 100644
--- a/gdb/testsuite/gdb.mi/mi-var-display.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-display.exp
@@ -24,6 +24,7 @@
 
 
 load_lib mi-support.exp
+set MIFLAGS "-i=mi"
 
 gdb_exit
 if [mi_gdb_start] {
diff --git a/gdb/testsuite/gdb.mi/mi-watch.exp b/gdb/testsuite/gdb.mi/mi-watch.exp
index 5b8908a..04c2b9f 100644
--- a/gdb/testsuite/gdb.mi/mi-watch.exp
+++ b/gdb/testsuite/gdb.mi/mi-watch.exp
@@ -29,6 +29,7 @@
 #
 
 load_lib mi-support.exp
+set MIFLAGS "-i=mi"
 
 gdb_exit
 if [mi_gdb_start] {
diff --git a/gdb/testsuite/gdb.mi/mi0-basics.exp b/gdb/testsuite/gdb.mi/mi0-basics.exp
index 41ce792..a64fdf2 100644
--- a/gdb/testsuite/gdb.mi/mi0-basics.exp
+++ b/gdb/testsuite/gdb.mi/mi0-basics.exp
@@ -30,6 +30,7 @@
 #
 
 load_lib mi-support.exp
+set MIFLAGS "-i=mi0"
 
 gdb_exit
 if [mi_gdb_start] {
diff --git a/gdb/testsuite/gdb.mi/mi0-break.exp b/gdb/testsuite/gdb.mi/mi0-break.exp
index 8ac38ea..fdad674 100644
--- a/gdb/testsuite/gdb.mi/mi0-break.exp
+++ b/gdb/testsuite/gdb.mi/mi0-break.exp
@@ -29,6 +29,7 @@
 #
 
 load_lib mi-support.exp
+set MIFLAGS "-i=mi0"
 
 gdb_exit
 if [mi_gdb_start] {
diff --git a/gdb/testsuite/gdb.mi/mi0-console.exp b/gdb/testsuite/gdb.mi/mi0-console.exp
index 04ee841..3e03fcf 100644
--- a/gdb/testsuite/gdb.mi/mi0-console.exp
+++ b/gdb/testsuite/gdb.mi/mi0-console.exp
@@ -33,6 +33,7 @@
 # remote target.
 
 load_lib mi-support.exp
+set MIFLAGS "-i=mi0"
 
 gdb_exit
 if [mi_gdb_start] {
diff --git a/gdb/testsuite/gdb.mi/mi0-disassemble.exp b/gdb/testsuite/gdb.mi/mi0-disassemble.exp
index 75f097d..deddf4b 100644
--- a/gdb/testsuite/gdb.mi/mi0-disassemble.exp
+++ b/gdb/testsuite/gdb.mi/mi0-disassemble.exp
@@ -25,6 +25,7 @@
 #
 
 load_lib mi-support.exp
+set MIFLAGS "-i=mi0"
 
 gdb_exit
 if [mi_gdb_start] {
diff --git a/gdb/testsuite/gdb.mi/mi0-eval.exp b/gdb/testsuite/gdb.mi/mi0-eval.exp
index 542d31d..ff41510 100644
--- a/gdb/testsuite/gdb.mi/mi0-eval.exp
+++ b/gdb/testsuite/gdb.mi/mi0-eval.exp
@@ -27,6 +27,7 @@
 #
 
 load_lib mi-support.exp
+set MIFLAGS "-i=mi0"
 
 gdb_exit
 if [mi_gdb_start] {
diff --git a/gdb/testsuite/gdb.mi/mi0-hack-cli.exp b/gdb/testsuite/gdb.mi/mi0-hack-cli.exp
index 44b7ff3..f8109bc 100644
--- a/gdb/testsuite/gdb.mi/mi0-hack-cli.exp
+++ b/gdb/testsuite/gdb.mi/mi0-hack-cli.exp
@@ -21,6 +21,7 @@
 # Some basic checks for the CLI.
 
 load_lib mi-support.exp
+set MIFLAGS "-i=mi0"
 
 gdb_exit
 if [mi_gdb_start] {
diff --git a/gdb/testsuite/gdb.mi/mi0-read-memory.exp b/gdb/testsuite/gdb.mi/mi0-read-memory.exp
index 871b129..bf344fc 100644
--- a/gdb/testsuite/gdb.mi/mi0-read-memory.exp
+++ b/gdb/testsuite/gdb.mi/mi0-read-memory.exp
@@ -30,6 +30,7 @@
 #
 
 load_lib mi-support.exp
+set MIFLAGS "-i=mi0"
 
 gdb_exit
 if [mi_gdb_start] {
diff --git a/gdb/testsuite/gdb.mi/mi0-regs.exp b/gdb/testsuite/gdb.mi/mi0-regs.exp
index 089b767..c918693 100644
--- a/gdb/testsuite/gdb.mi/mi0-regs.exp
+++ b/gdb/testsuite/gdb.mi/mi0-regs.exp
@@ -27,6 +27,7 @@
 
 
 load_lib mi-support.exp
+set MIFLAGS "-i=mi0"
 
 gdb_exit
 if [mi_gdb_start] {
diff --git a/gdb/testsuite/gdb.mi/mi0-return.exp b/gdb/testsuite/gdb.mi/mi0-return.exp
index 57ea05e..5f3b585 100644
--- a/gdb/testsuite/gdb.mi/mi0-return.exp
+++ b/gdb/testsuite/gdb.mi/mi0-return.exp
@@ -27,6 +27,7 @@
 #
 
 load_lib mi-support.exp
+set MIFLAGS "-i=mi0"
 
 gdb_exit
 if [mi_gdb_start] {
diff --git a/gdb/testsuite/gdb.mi/mi0-simplerun.exp b/gdb/testsuite/gdb.mi/mi0-simplerun.exp
index 636f60d..55c699c 100644
--- a/gdb/testsuite/gdb.mi/mi0-simplerun.exp
+++ b/gdb/testsuite/gdb.mi/mi0-simplerun.exp
@@ -29,6 +29,7 @@
 #
 
 load_lib mi-support.exp
+set MIFLAGS "-i=mi0"
 
 gdb_exit
 if [mi_gdb_start] {
diff --git a/gdb/testsuite/gdb.mi/mi0-stack.exp b/gdb/testsuite/gdb.mi/mi0-stack.exp
index 045e981..ebed25d 100644
--- a/gdb/testsuite/gdb.mi/mi0-stack.exp
+++ b/gdb/testsuite/gdb.mi/mi0-stack.exp
@@ -27,6 +27,7 @@
 #
 
 load_lib mi-support.exp
+set MIFLAGS "-i=mi0"
 
 gdb_exit
 if [mi_gdb_start] {
diff --git a/gdb/testsuite/gdb.mi/mi0-stepi.exp b/gdb/testsuite/gdb.mi/mi0-stepi.exp
index a67d742..def2134 100644
--- a/gdb/testsuite/gdb.mi/mi0-stepi.exp
+++ b/gdb/testsuite/gdb.mi/mi0-stepi.exp
@@ -27,6 +27,7 @@
 #
 
 load_lib mi-support.exp
+set MIFLAGS "-i=mi0"
 
 gdb_exit
 if [mi_gdb_start] {
diff --git a/gdb/testsuite/gdb.mi/mi0-until.exp b/gdb/testsuite/gdb.mi/mi0-until.exp
index cf3c21d..12c711e 100644
--- a/gdb/testsuite/gdb.mi/mi0-until.exp
+++ b/gdb/testsuite/gdb.mi/mi0-until.exp
@@ -27,6 +27,7 @@
 #
 
 load_lib mi-support.exp
+set MIFLAGS "-i=mi0"
 
 gdb_exit
 if [mi_gdb_start] {
diff --git a/gdb/testsuite/gdb.mi/mi0-var-block.exp b/gdb/testsuite/gdb.mi/mi0-var-block.exp
index 539a58d..d0f69b8 100644
--- a/gdb/testsuite/gdb.mi/mi0-var-block.exp
+++ b/gdb/testsuite/gdb.mi/mi0-var-block.exp
@@ -24,6 +24,7 @@
 
 
 load_lib mi-support.exp
+set MIFLAGS "-i=mi0"
 
 gdb_exit
 if [mi_gdb_start] {
diff --git a/gdb/testsuite/gdb.mi/mi0-var-child.exp b/gdb/testsuite/gdb.mi/mi0-var-child.exp
index 6ac6e6b..e5c62c9 100644
--- a/gdb/testsuite/gdb.mi/mi0-var-child.exp
+++ b/gdb/testsuite/gdb.mi/mi0-var-child.exp
@@ -24,6 +24,7 @@
 
 
 load_lib mi-support.exp
+set MIFLAGS "-i=mi0"
 
 gdb_exit
 if [mi_gdb_start] {
diff --git a/gdb/testsuite/gdb.mi/mi0-var-cmd.exp b/gdb/testsuite/gdb.mi/mi0-var-cmd.exp
index f1fcedd..ed48e5e 100644
--- a/gdb/testsuite/gdb.mi/mi0-var-cmd.exp
+++ b/gdb/testsuite/gdb.mi/mi0-var-cmd.exp
@@ -24,6 +24,7 @@
 
 
 load_lib mi-support.exp
+set MIFLAGS "-i=mi0"
 
 gdb_exit
 if [mi_gdb_start] {
diff --git a/gdb/testsuite/gdb.mi/mi0-var-display.exp b/gdb/testsuite/gdb.mi/mi0-var-display.exp
index 4f231d0..ee29d43 100644
--- a/gdb/testsuite/gdb.mi/mi0-var-display.exp
+++ b/gdb/testsuite/gdb.mi/mi0-var-display.exp
@@ -24,6 +24,7 @@
 
 
 load_lib mi-support.exp
+set MIFLAGS "-i=mi0"
 
 gdb_exit
 if [mi_gdb_start] {
diff --git a/gdb/testsuite/gdb.mi/mi0-watch.exp b/gdb/testsuite/gdb.mi/mi0-watch.exp
index 5b8908a..c66cbb5 100644
--- a/gdb/testsuite/gdb.mi/mi0-watch.exp
+++ b/gdb/testsuite/gdb.mi/mi0-watch.exp
@@ -29,6 +29,7 @@
 #
 
 load_lib mi-support.exp
+set MIFLAGS "-i=mi0"
 
 gdb_exit
 if [mi_gdb_start] {