From 3788363dacd2b8d048c68c3d411333195bd8f30a Mon Sep 17 00:00:00 2001
From: Daniel Jacobowitz <drow@false.org>
Date: Tue, 9 Jun 2009 17:12:43 +0000
Subject: [PATCH] 	* gdb.mi/mi-async.exp, gdb.mi/mi-basics.exp, 
 gdb.mi/mi-break.exp, gdb.mi/mi-cli.exp, 	gdb.mi/mi-disassemble.exp,
 gdb.mi/mi-eval.exp, 	gdb.mi/mi-file-transfer.exp, gdb.mi/mi-file.exp, 
 gdb.mi/mi-regs.exp, gdb.mi/mi-return.exp, 	gdb.mi/mi-simplerun.exp,
 gdb.mi/mi-stepi.exp, 	gdb.mi/mi-var-block.exp, gdb.mi/mi-var-cmd.exp, 
 gdb.mi/mi-var-display.exp, gdb.mi/mi-var-invalidate.exp, 
 gdb.mi/mi-watch.exp, gdb.mi/mi2-basics.exp, 	gdb.mi/mi2-break.exp,
 gdb.mi/mi2-cli.exp, 	gdb.mi/mi2-disassemble.exp, gdb.mi/mi2-eval.exp, 
 gdb.mi/mi2-file.exp, gdb.mi/mi2-regs.exp, 	gdb.mi/mi2-return.exp,
 gdb.mi/mi2-simplerun.exp, 	gdb.mi/mi2-stepi.exp,
 gdb.mi/mi2-var-block.exp, 	gdb.mi/mi2-var-child.exp,
 gdb.mi/mi2-var-cmd.exp, 	gdb.mi/mi2-var-display.exp,
 gdb.mi/mi2-watch.exp, 	gdb.server/ext-run.exp, gdb.server/file-transfer.exp, 
 gdb.server/server-mon.exp, gdb.server/server-run.exp, 	gdb.trace/actions.exp,
 gdb.trace/backtrace.exp, 	gdb.trace/deltrace.exp,
 gdb.trace/infotrace.exp, 	gdb.trace/packetlen.exp,
 gdb.trace/passc-dyn.exp, 	gdb.trace/passcount.exp, gdb.trace/report.exp,
 	gdb.trace/save-trace.exp, gdb.trace/tfind.exp, 
 gdb.trace/tracecmd.exp, gdb.trace/while-dyn.exp, 
 gdb.trace/while-stepping.exp: Use a unique name for the compiled 
 executable.

---
 gdb/testsuite/ChangeLog                    | 29 ++++++++++++++++++++++
 gdb/testsuite/gdb.mi/mi-async.exp          |  2 +-
 gdb/testsuite/gdb.mi/mi-basics.exp         |  2 +-
 gdb/testsuite/gdb.mi/mi-break.exp          |  2 +-
 gdb/testsuite/gdb.mi/mi-cli.exp            |  4 +--
 gdb/testsuite/gdb.mi/mi-disassemble.exp    |  2 +-
 gdb/testsuite/gdb.mi/mi-eval.exp           |  2 +-
 gdb/testsuite/gdb.mi/mi-file-transfer.exp  |  2 +-
 gdb/testsuite/gdb.mi/mi-file.exp           |  2 +-
 gdb/testsuite/gdb.mi/mi-regs.exp           |  2 +-
 gdb/testsuite/gdb.mi/mi-return.exp         |  2 +-
 gdb/testsuite/gdb.mi/mi-simplerun.exp      |  2 +-
 gdb/testsuite/gdb.mi/mi-stepi.exp          |  2 +-
 gdb/testsuite/gdb.mi/mi-var-block.exp      |  2 +-
 gdb/testsuite/gdb.mi/mi-var-cmd.exp        |  2 +-
 gdb/testsuite/gdb.mi/mi-var-display.exp    |  2 +-
 gdb/testsuite/gdb.mi/mi-var-invalidate.exp |  4 +--
 gdb/testsuite/gdb.mi/mi-watch.exp          |  2 +-
 gdb/testsuite/gdb.mi/mi2-basics.exp        |  2 +-
 gdb/testsuite/gdb.mi/mi2-break.exp         |  2 +-
 gdb/testsuite/gdb.mi/mi2-cli.exp           |  4 +--
 gdb/testsuite/gdb.mi/mi2-disassemble.exp   |  2 +-
 gdb/testsuite/gdb.mi/mi2-eval.exp          |  2 +-
 gdb/testsuite/gdb.mi/mi2-file.exp          |  2 +-
 gdb/testsuite/gdb.mi/mi2-regs.exp          |  2 +-
 gdb/testsuite/gdb.mi/mi2-return.exp        |  2 +-
 gdb/testsuite/gdb.mi/mi2-simplerun.exp     |  2 +-
 gdb/testsuite/gdb.mi/mi2-stepi.exp         |  2 +-
 gdb/testsuite/gdb.mi/mi2-var-block.exp     |  2 +-
 gdb/testsuite/gdb.mi/mi2-var-child.exp     |  2 +-
 gdb/testsuite/gdb.mi/mi2-var-cmd.exp       |  2 +-
 gdb/testsuite/gdb.mi/mi2-var-display.exp   |  2 +-
 gdb/testsuite/gdb.mi/mi2-watch.exp         |  2 +-
 gdb/testsuite/gdb.server/ext-run.exp       |  2 +-
 gdb/testsuite/gdb.server/file-transfer.exp |  2 +-
 gdb/testsuite/gdb.server/server-mon.exp    |  2 +-
 gdb/testsuite/gdb.server/server-run.exp    |  2 +-
 gdb/testsuite/gdb.trace/actions.exp        |  2 +-
 gdb/testsuite/gdb.trace/backtrace.exp      |  2 +-
 gdb/testsuite/gdb.trace/deltrace.exp       |  2 +-
 gdb/testsuite/gdb.trace/infotrace.exp      |  2 +-
 gdb/testsuite/gdb.trace/packetlen.exp      |  2 +-
 gdb/testsuite/gdb.trace/passc-dyn.exp      |  2 +-
 gdb/testsuite/gdb.trace/passcount.exp      |  2 +-
 gdb/testsuite/gdb.trace/report.exp         |  2 +-
 gdb/testsuite/gdb.trace/save-trace.exp     |  2 +-
 gdb/testsuite/gdb.trace/tfind.exp          |  2 +-
 gdb/testsuite/gdb.trace/tracecmd.exp       |  2 +-
 gdb/testsuite/gdb.trace/while-dyn.exp      |  2 +-
 gdb/testsuite/gdb.trace/while-stepping.exp |  2 +-
 50 files changed, 81 insertions(+), 52 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index c38ac3d3e61..c5fb2e7a2e3 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,32 @@
+2009-06-09  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* gdb.mi/mi-async.exp, gdb.mi/mi-basics.exp,
+	gdb.mi/mi-break.exp, gdb.mi/mi-cli.exp,
+	gdb.mi/mi-disassemble.exp, gdb.mi/mi-eval.exp,
+	gdb.mi/mi-file-transfer.exp, gdb.mi/mi-file.exp,
+	gdb.mi/mi-regs.exp, gdb.mi/mi-return.exp,
+	gdb.mi/mi-simplerun.exp, gdb.mi/mi-stepi.exp,
+	gdb.mi/mi-var-block.exp, gdb.mi/mi-var-cmd.exp,
+	gdb.mi/mi-var-display.exp, gdb.mi/mi-var-invalidate.exp,
+	gdb.mi/mi-watch.exp, gdb.mi/mi2-basics.exp,
+	gdb.mi/mi2-break.exp, gdb.mi/mi2-cli.exp,
+	gdb.mi/mi2-disassemble.exp, gdb.mi/mi2-eval.exp,
+	gdb.mi/mi2-file.exp, gdb.mi/mi2-regs.exp,
+	gdb.mi/mi2-return.exp, gdb.mi/mi2-simplerun.exp,
+	gdb.mi/mi2-stepi.exp, gdb.mi/mi2-var-block.exp,
+	gdb.mi/mi2-var-child.exp, gdb.mi/mi2-var-cmd.exp,
+	gdb.mi/mi2-var-display.exp, gdb.mi/mi2-watch.exp,
+	gdb.server/ext-run.exp, gdb.server/file-transfer.exp,
+	gdb.server/server-mon.exp, gdb.server/server-run.exp,
+	gdb.trace/actions.exp, gdb.trace/backtrace.exp,
+	gdb.trace/deltrace.exp, gdb.trace/infotrace.exp,
+	gdb.trace/packetlen.exp, gdb.trace/passc-dyn.exp,
+	gdb.trace/passcount.exp, gdb.trace/report.exp,
+	gdb.trace/save-trace.exp, gdb.trace/tfind.exp,
+	gdb.trace/tracecmd.exp, gdb.trace/while-dyn.exp,
+	gdb.trace/while-stepping.exp: Use a unique name for the compiled
+	executable.
+
 2009-06-07  Pedro Alves  <pedro@codesourcery.com>
 
 	* gdb.threads/manythreads.c (main): Check if PTHREAD_STACK_MIN is
diff --git a/gdb/testsuite/gdb.mi/mi-async.exp b/gdb/testsuite/gdb.mi/mi-async.exp
index 31e1d3571f7..86c76b9dbe0 100644
--- a/gdb/testsuite/gdb.mi/mi-async.exp
+++ b/gdb/testsuite/gdb.mi/mi-async.exp
@@ -38,7 +38,7 @@ if [mi_gdb_start] {
 
 set testfile "basics"
 set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+set binfile ${objdir}/${subdir}/mi-async
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
      untested mi-async.exp
      return -1
diff --git a/gdb/testsuite/gdb.mi/mi-basics.exp b/gdb/testsuite/gdb.mi/mi-basics.exp
index a3d57ce1258..fd9df832123 100644
--- a/gdb/testsuite/gdb.mi/mi-basics.exp
+++ b/gdb/testsuite/gdb.mi/mi-basics.exp
@@ -36,7 +36,7 @@ if [mi_gdb_start separate-inferior-tty] {
 
 set testfile "basics"
 set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+set binfile ${objdir}/${subdir}/mi-basics
 set escapedobjdir [string_to_regexp ${objdir}]
 set envirodir [string_to_regexp ${objdir}/${subdir}]
 
diff --git a/gdb/testsuite/gdb.mi/mi-break.exp b/gdb/testsuite/gdb.mi/mi-break.exp
index 0f91af779a1..4b8d101b3a1 100644
--- a/gdb/testsuite/gdb.mi/mi-break.exp
+++ b/gdb/testsuite/gdb.mi/mi-break.exp
@@ -35,7 +35,7 @@ if [mi_gdb_start] {
 
 set testfile "basics"
 set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+set binfile ${objdir}/${subdir}/mi-break
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
      untested mi-break.exp
      return -1
diff --git a/gdb/testsuite/gdb.mi/mi-cli.exp b/gdb/testsuite/gdb.mi/mi-cli.exp
index 42747cab0d7..029c2b87a69 100644
--- a/gdb/testsuite/gdb.mi/mi-cli.exp
+++ b/gdb/testsuite/gdb.mi/mi-cli.exp
@@ -30,7 +30,7 @@ if [mi_gdb_start] {
 
 set testfile "basics"
 set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+set binfile ${objdir}/${subdir}/mi-cli
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
      untested mi-cli.exp
      return -1
@@ -58,7 +58,7 @@ mi_gdb_test "-interpreter-exec console bogus" \
 #   {(=.*)+\^done} \
 #   "-interpreter-exec console \"file \$binfile\""
 mi_gdb_test "-interpreter-exec console \"file $binfile\"" \
-  {~"Reading symbols from .*basics...".*done} \
+  {~"Reading symbols from .*mi-cli...".*done} \
   "-interpreter-exec console \"file \$binfile\""
 
 mi_run_to_main
diff --git a/gdb/testsuite/gdb.mi/mi-disassemble.exp b/gdb/testsuite/gdb.mi/mi-disassemble.exp
index e8e885fa9a6..d6b302c153f 100644
--- a/gdb/testsuite/gdb.mi/mi-disassemble.exp
+++ b/gdb/testsuite/gdb.mi/mi-disassemble.exp
@@ -31,7 +31,7 @@ if [mi_gdb_start] {
 
 set testfile "basics"
 set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+set binfile ${objdir}/${subdir}/mi-disassemble
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
      untested mi-disassemble.exp
      return -1
diff --git a/gdb/testsuite/gdb.mi/mi-eval.exp b/gdb/testsuite/gdb.mi/mi-eval.exp
index f44331cf960..8dfc269f084 100644
--- a/gdb/testsuite/gdb.mi/mi-eval.exp
+++ b/gdb/testsuite/gdb.mi/mi-eval.exp
@@ -33,7 +33,7 @@ if [mi_gdb_start] {
 
 set testfile "basics"
 set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+set binfile ${objdir}/${subdir}/mi-eval
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
      untested mi-eval.exp
      return -1
diff --git a/gdb/testsuite/gdb.mi/mi-file-transfer.exp b/gdb/testsuite/gdb.mi/mi-file-transfer.exp
index b2e6c37f9a4..f610066f9a4 100644
--- a/gdb/testsuite/gdb.mi/mi-file-transfer.exp
+++ b/gdb/testsuite/gdb.mi/mi-file-transfer.exp
@@ -26,7 +26,7 @@ if { [skip_gdbserver_tests] } {
 
 set testfile "basics"
 set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+set binfile ${objdir}/${subdir}/mi-file-transfer
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
     untested mi-file-transfer.exp
     return -1
diff --git a/gdb/testsuite/gdb.mi/mi-file.exp b/gdb/testsuite/gdb.mi/mi-file.exp
index d6a4e5628d0..845e2b23a4e 100644
--- a/gdb/testsuite/gdb.mi/mi-file.exp
+++ b/gdb/testsuite/gdb.mi/mi-file.exp
@@ -34,7 +34,7 @@ if [mi_gdb_start] {
 
 set testfile "basics"
 set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+set binfile ${objdir}/${subdir}/mi-file
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
      untested mi-file.exp
      return -1
diff --git a/gdb/testsuite/gdb.mi/mi-regs.exp b/gdb/testsuite/gdb.mi/mi-regs.exp
index 21f11229334..25131916cc5 100644
--- a/gdb/testsuite/gdb.mi/mi-regs.exp
+++ b/gdb/testsuite/gdb.mi/mi-regs.exp
@@ -33,7 +33,7 @@ if [mi_gdb_start] {
 
 set testfile "basics"
 set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+set binfile ${objdir}/${subdir}/mi-regs
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
      untested mi-regs.exp
      return -1
diff --git a/gdb/testsuite/gdb.mi/mi-return.exp b/gdb/testsuite/gdb.mi/mi-return.exp
index b2585d2b1fb..5cc06178746 100644
--- a/gdb/testsuite/gdb.mi/mi-return.exp
+++ b/gdb/testsuite/gdb.mi/mi-return.exp
@@ -33,7 +33,7 @@ if [mi_gdb_start] {
 
 set testfile "basics"
 set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+set binfile ${objdir}/${subdir}/mi-return
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
      untested mi-return.exp
      return -1
diff --git a/gdb/testsuite/gdb.mi/mi-simplerun.exp b/gdb/testsuite/gdb.mi/mi-simplerun.exp
index 14a14460a19..32a7cf3c228 100644
--- a/gdb/testsuite/gdb.mi/mi-simplerun.exp
+++ b/gdb/testsuite/gdb.mi/mi-simplerun.exp
@@ -35,7 +35,7 @@ if [mi_gdb_start] {
 
 set testfile "basics"
 set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+set binfile ${objdir}/${subdir}/mi-simplerun
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
      untested mi-simplerun.exp
      return -1
diff --git a/gdb/testsuite/gdb.mi/mi-stepi.exp b/gdb/testsuite/gdb.mi/mi-stepi.exp
index d8ed001fbcf..ae8b720c47e 100644
--- a/gdb/testsuite/gdb.mi/mi-stepi.exp
+++ b/gdb/testsuite/gdb.mi/mi-stepi.exp
@@ -33,7 +33,7 @@ if [mi_gdb_start] {
 
 set testfile "basics"
 set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+set binfile ${objdir}/${subdir}/mi-stepi
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
      untested mi-stepi.exp
      return -1
diff --git a/gdb/testsuite/gdb.mi/mi-var-block.exp b/gdb/testsuite/gdb.mi/mi-var-block.exp
index d8298685c15..880684897f0 100644
--- a/gdb/testsuite/gdb.mi/mi-var-block.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-block.exp
@@ -30,7 +30,7 @@ if [mi_gdb_start] {
 
 set testfile "var-cmd"
 set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+set binfile ${objdir}/${subdir}/mi-var-block
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
     untested mi-var-block.exp
     return -1
diff --git a/gdb/testsuite/gdb.mi/mi-var-cmd.exp b/gdb/testsuite/gdb.mi/mi-var-cmd.exp
index 78b30bd9205..46906c08cdf 100644
--- a/gdb/testsuite/gdb.mi/mi-var-cmd.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-cmd.exp
@@ -30,7 +30,7 @@ if [mi_gdb_start] {
 
 set testfile "var-cmd"
 set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+set binfile ${objdir}/${subdir}/mi-var-cmd
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
     untested mi-var-cmd.exp
     return -1
diff --git a/gdb/testsuite/gdb.mi/mi-var-display.exp b/gdb/testsuite/gdb.mi/mi-var-display.exp
index 0fe2e639f61..59be6b283b0 100644
--- a/gdb/testsuite/gdb.mi/mi-var-display.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-display.exp
@@ -30,7 +30,7 @@ if [mi_gdb_start] {
 
 set testfile "var-cmd"
 set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+set binfile ${objdir}/${subdir}/mi-var-display
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
     untested mi-var-display.exp
     return -1
diff --git a/gdb/testsuite/gdb.mi/mi-var-invalidate.exp b/gdb/testsuite/gdb.mi/mi-var-invalidate.exp
index 6912e28cba5..05d46fa9e6d 100644
--- a/gdb/testsuite/gdb.mi/mi-var-invalidate.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-invalidate.exp
@@ -30,13 +30,13 @@ if [mi_gdb_start] {
 
 set testfile "var-cmd"
 set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+set binfile ${objdir}/${subdir}/mi-var-invalidate
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
     untested mi-var-invalidate.exp
     return -1
 }
 # Just change the output binary.
-set binfile_bis ${objdir}/${subdir}/${testfile}_bis
+set binfile_bis ${objdir}/${subdir}/mi-var-invalidate_bis
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile_bis}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
     untested mi-var-invalidate.exp
     return -1
diff --git a/gdb/testsuite/gdb.mi/mi-watch.exp b/gdb/testsuite/gdb.mi/mi-watch.exp
index 7dec720906e..d3f7dba6e26 100644
--- a/gdb/testsuite/gdb.mi/mi-watch.exp
+++ b/gdb/testsuite/gdb.mi/mi-watch.exp
@@ -35,7 +35,7 @@ if [mi_gdb_start] {
 
 set testfile "basics"
 set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+set binfile ${objdir}/${subdir}/mi-watch
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
      untested mi-watch.exp
      return -1
diff --git a/gdb/testsuite/gdb.mi/mi2-basics.exp b/gdb/testsuite/gdb.mi/mi2-basics.exp
index 54b9d2ffbd0..db22c937455 100644
--- a/gdb/testsuite/gdb.mi/mi2-basics.exp
+++ b/gdb/testsuite/gdb.mi/mi2-basics.exp
@@ -36,7 +36,7 @@ if [mi_gdb_start] {
 
 set testfile "basics"
 set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+set binfile ${objdir}/${subdir}/mi2-basics
 set escapedobjdir [string_to_regexp ${objdir}]
 set envirodir [string_to_regexp ${objdir}/${subdir}]
 
diff --git a/gdb/testsuite/gdb.mi/mi2-break.exp b/gdb/testsuite/gdb.mi/mi2-break.exp
index 7f433155d5a..0c26bf4a803 100644
--- a/gdb/testsuite/gdb.mi/mi2-break.exp
+++ b/gdb/testsuite/gdb.mi/mi2-break.exp
@@ -35,7 +35,7 @@ if [mi_gdb_start] {
 
 set testfile "basics"
 set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+set binfile ${objdir}/${subdir}/mi2-break
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
      untested mi2-break.exp
      return -1
diff --git a/gdb/testsuite/gdb.mi/mi2-cli.exp b/gdb/testsuite/gdb.mi/mi2-cli.exp
index ae01ccd19eb..86186086e75 100644
--- a/gdb/testsuite/gdb.mi/mi2-cli.exp
+++ b/gdb/testsuite/gdb.mi/mi2-cli.exp
@@ -30,7 +30,7 @@ if [mi_gdb_start] {
 
 set testfile "basics"
 set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+set binfile ${objdir}/${subdir}/mi2-cli
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
      untested mi2-cli.exp
      return -1
@@ -58,7 +58,7 @@ mi_gdb_test "-interpreter-exec console bogus" \
 #   {(=.*)+\^done} \
 #   "-interpreter-exec console \"file \$binfile\""
 mi_gdb_test "-interpreter-exec console \"file $binfile\"" \
-  {~"Reading symbols from .*basics...".*\^done} \
+  {~"Reading symbols from .*mi2-cli...".*\^done} \
   "-interpreter-exec console \"file \$binfile\""
 
 mi_run_to_main
diff --git a/gdb/testsuite/gdb.mi/mi2-disassemble.exp b/gdb/testsuite/gdb.mi/mi2-disassemble.exp
index 25501d2d29e..af731dd6d0b 100644
--- a/gdb/testsuite/gdb.mi/mi2-disassemble.exp
+++ b/gdb/testsuite/gdb.mi/mi2-disassemble.exp
@@ -31,7 +31,7 @@ if [mi_gdb_start] {
 
 set testfile "basics"
 set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+set binfile ${objdir}/${subdir}/mi2-disassemble
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
      untested mi2-disassemble.exp
      return -1
diff --git a/gdb/testsuite/gdb.mi/mi2-eval.exp b/gdb/testsuite/gdb.mi/mi2-eval.exp
index e17c5d23d39..a587833322f 100644
--- a/gdb/testsuite/gdb.mi/mi2-eval.exp
+++ b/gdb/testsuite/gdb.mi/mi2-eval.exp
@@ -33,7 +33,7 @@ if [mi_gdb_start] {
 
 set testfile "basics"
 set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+set binfile ${objdir}/${subdir}/mi2-eval
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
      untested mi2-eval.exp
      return -1
diff --git a/gdb/testsuite/gdb.mi/mi2-file.exp b/gdb/testsuite/gdb.mi/mi2-file.exp
index b4fde6d7cc8..990313a34eb 100644
--- a/gdb/testsuite/gdb.mi/mi2-file.exp
+++ b/gdb/testsuite/gdb.mi/mi2-file.exp
@@ -34,7 +34,7 @@ if [mi_gdb_start] {
 
 set testfile "basics"
 set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+set binfile ${objdir}/${subdir}/mi2-file
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
      untested mi2-file.exp
      return -1
diff --git a/gdb/testsuite/gdb.mi/mi2-regs.exp b/gdb/testsuite/gdb.mi/mi2-regs.exp
index 88d00f4d2d0..c5c36a5e4b5 100644
--- a/gdb/testsuite/gdb.mi/mi2-regs.exp
+++ b/gdb/testsuite/gdb.mi/mi2-regs.exp
@@ -33,7 +33,7 @@ if [mi_gdb_start] {
 
 set testfile "basics"
 set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+set binfile ${objdir}/${subdir}/mi2-regs
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
      untested mi2-regs.exp
      return -1
diff --git a/gdb/testsuite/gdb.mi/mi2-return.exp b/gdb/testsuite/gdb.mi/mi2-return.exp
index a77c0484c28..2ea27a647ec 100644
--- a/gdb/testsuite/gdb.mi/mi2-return.exp
+++ b/gdb/testsuite/gdb.mi/mi2-return.exp
@@ -33,7 +33,7 @@ if [mi_gdb_start] {
 
 set testfile "basics"
 set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+set binfile ${objdir}/${subdir}/mi2-return
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
      untested mi2-return.exp
      return -1
diff --git a/gdb/testsuite/gdb.mi/mi2-simplerun.exp b/gdb/testsuite/gdb.mi/mi2-simplerun.exp
index 13443ee1a6e..42175ff89cf 100644
--- a/gdb/testsuite/gdb.mi/mi2-simplerun.exp
+++ b/gdb/testsuite/gdb.mi/mi2-simplerun.exp
@@ -35,7 +35,7 @@ if [mi_gdb_start] {
 
 set testfile "basics"
 set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+set binfile ${objdir}/${subdir}/mi2-simplerun
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
      untested mi2-simplerun.exp
      return -1
diff --git a/gdb/testsuite/gdb.mi/mi2-stepi.exp b/gdb/testsuite/gdb.mi/mi2-stepi.exp
index 6bc5c30f586..237b3bbd78b 100644
--- a/gdb/testsuite/gdb.mi/mi2-stepi.exp
+++ b/gdb/testsuite/gdb.mi/mi2-stepi.exp
@@ -33,7 +33,7 @@ if [mi_gdb_start] {
 
 set testfile "basics"
 set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+set binfile ${objdir}/${subdir}/mi2-stepi
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
      untested mi2-stepi.exp
      return -1
diff --git a/gdb/testsuite/gdb.mi/mi2-var-block.exp b/gdb/testsuite/gdb.mi/mi2-var-block.exp
index b166c56c853..6bcfea3aba2 100644
--- a/gdb/testsuite/gdb.mi/mi2-var-block.exp
+++ b/gdb/testsuite/gdb.mi/mi2-var-block.exp
@@ -30,7 +30,7 @@ if [mi_gdb_start] {
 
 set testfile "var-cmd"
 set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+set binfile ${objdir}/${subdir}/mi2-var-block
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
     untested mi2-var-block.exp
     return -1
diff --git a/gdb/testsuite/gdb.mi/mi2-var-child.exp b/gdb/testsuite/gdb.mi/mi2-var-child.exp
index 91f7e9f9e7a..161b34f9e36 100644
--- a/gdb/testsuite/gdb.mi/mi2-var-child.exp
+++ b/gdb/testsuite/gdb.mi/mi2-var-child.exp
@@ -29,7 +29,7 @@ if [mi_gdb_start] {
 
 set testfile "var-cmd"
 set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+set binfile ${objdir}/${subdir}/mi2-var-child
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
     untested mi2-var-child.exp
     return -1
diff --git a/gdb/testsuite/gdb.mi/mi2-var-cmd.exp b/gdb/testsuite/gdb.mi/mi2-var-cmd.exp
index a4279a86857..8421565cd89 100644
--- a/gdb/testsuite/gdb.mi/mi2-var-cmd.exp
+++ b/gdb/testsuite/gdb.mi/mi2-var-cmd.exp
@@ -30,7 +30,7 @@ if [mi_gdb_start] {
 
 set testfile "var-cmd"
 set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+set binfile ${objdir}/${subdir}/mi2-var-cmd
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
     untested mi2-var-cmd.exp
     return -1
diff --git a/gdb/testsuite/gdb.mi/mi2-var-display.exp b/gdb/testsuite/gdb.mi/mi2-var-display.exp
index c045ac4d2eb..9c98694e135 100644
--- a/gdb/testsuite/gdb.mi/mi2-var-display.exp
+++ b/gdb/testsuite/gdb.mi/mi2-var-display.exp
@@ -30,7 +30,7 @@ if [mi_gdb_start] {
 
 set testfile "var-cmd"
 set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+set binfile ${objdir}/${subdir}/mi2-var-display
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
     untested mi2-var-display.exp
     return -1
diff --git a/gdb/testsuite/gdb.mi/mi2-watch.exp b/gdb/testsuite/gdb.mi/mi2-watch.exp
index fbf54739931..04177b06d14 100644
--- a/gdb/testsuite/gdb.mi/mi2-watch.exp
+++ b/gdb/testsuite/gdb.mi/mi2-watch.exp
@@ -35,7 +35,7 @@ if [mi_gdb_start] {
 
 set testfile "basics"
 set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+set binfile ${objdir}/${subdir}/mi2-watch
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } {
      untested mi2-watch.exp
      return -1
diff --git a/gdb/testsuite/gdb.server/ext-run.exp b/gdb/testsuite/gdb.server/ext-run.exp
index 6b5fd729231..660b9e2bb28 100644
--- a/gdb/testsuite/gdb.server/ext-run.exp
+++ b/gdb/testsuite/gdb.server/ext-run.exp
@@ -21,7 +21,7 @@ load_lib gdbserver-support.exp
 
 set testfile "server"
 set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+set binfile ${objdir}/${subdir}/ext-run
 
 if { [skip_gdbserver_tests] } {
     return 0
diff --git a/gdb/testsuite/gdb.server/file-transfer.exp b/gdb/testsuite/gdb.server/file-transfer.exp
index a7dfa0e8dce..38bca1c345c 100644
--- a/gdb/testsuite/gdb.server/file-transfer.exp
+++ b/gdb/testsuite/gdb.server/file-transfer.exp
@@ -20,7 +20,7 @@ load_lib gdbserver-support.exp
 
 set testfile "server"
 set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}${EXEEXT}
+set binfile ${objdir}/${subdir}/file-transfer${EXEEXT}
 
 if { [skip_gdbserver_tests] } {
     return 0
diff --git a/gdb/testsuite/gdb.server/server-mon.exp b/gdb/testsuite/gdb.server/server-mon.exp
index 9dd06226576..cacfbacdb18 100644
--- a/gdb/testsuite/gdb.server/server-mon.exp
+++ b/gdb/testsuite/gdb.server/server-mon.exp
@@ -21,7 +21,7 @@ load_lib gdbserver-support.exp
 
 set testfile "server"
 set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+set binfile ${objdir}/${subdir}/server-mon
 
 if { [skip_gdbserver_tests] } {
     return 0
diff --git a/gdb/testsuite/gdb.server/server-run.exp b/gdb/testsuite/gdb.server/server-run.exp
index 535de8e0685..6a9d341eb46 100644
--- a/gdb/testsuite/gdb.server/server-run.exp
+++ b/gdb/testsuite/gdb.server/server-run.exp
@@ -21,7 +21,7 @@ load_lib gdbserver-support.exp
 
 set testfile "server"
 set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+set binfile ${objdir}/${subdir}/server-run
 
 if { [skip_gdbserver_tests] } {
     return 0
diff --git a/gdb/testsuite/gdb.trace/actions.exp b/gdb/testsuite/gdb.trace/actions.exp
index f1f329cd492..0cfeb0d43b1 100644
--- a/gdb/testsuite/gdb.trace/actions.exp
+++ b/gdb/testsuite/gdb.trace/actions.exp
@@ -33,7 +33,7 @@ if [istarget "m68k-*-elf"] then {
 } else {
     set testfile "actions"
     set srcfile ${testfile}.c
-    set binfile $objdir/$subdir/$testfile
+    set binfile $objdir/$subdir/actions
     if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	    executable {debug nowarnings}] != "" } {
 	untested actions.exp
diff --git a/gdb/testsuite/gdb.trace/backtrace.exp b/gdb/testsuite/gdb.trace/backtrace.exp
index 82911f45d46..48056ede9b4 100644
--- a/gdb/testsuite/gdb.trace/backtrace.exp
+++ b/gdb/testsuite/gdb.trace/backtrace.exp
@@ -49,7 +49,7 @@ if [istarget "m68k-*-elf"] then {
 } else {
     set testfile "actions"
     set srcfile ${testfile}.c
-    set binfile $objdir/$subdir/$testfile
+    set binfile $objdir/$subdir/backtrace
     if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	    executable {debug nowarnings}] != "" } {
 	untested backtrace.exp
diff --git a/gdb/testsuite/gdb.trace/deltrace.exp b/gdb/testsuite/gdb.trace/deltrace.exp
index 561f0502517..8afe7e5eb3d 100644
--- a/gdb/testsuite/gdb.trace/deltrace.exp
+++ b/gdb/testsuite/gdb.trace/deltrace.exp
@@ -33,7 +33,7 @@ if [istarget "m68k-*-elf"] then {
 } else {
     set testfile "actions"
     set srcfile ${testfile}.c
-    set binfile $objdir/$subdir/$testfile
+    set binfile $objdir/$subdir/deltrace
     if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	    executable {debug nowarnings}] != "" } {
 	untested deltrace.exp
diff --git a/gdb/testsuite/gdb.trace/infotrace.exp b/gdb/testsuite/gdb.trace/infotrace.exp
index 258945da56e..9b43c987e66 100644
--- a/gdb/testsuite/gdb.trace/infotrace.exp
+++ b/gdb/testsuite/gdb.trace/infotrace.exp
@@ -33,7 +33,7 @@ if [istarget "m68k-*-elf"] then {
 } else {
     set testfile "actions"
     set srcfile ${testfile}.c
-    set binfile $objdir/$subdir/$testfile
+    set binfile $objdir/$subdir/infotrace
     if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	    executable {debug nowarnings}] != "" } {
 	untested infotrace.exp
diff --git a/gdb/testsuite/gdb.trace/packetlen.exp b/gdb/testsuite/gdb.trace/packetlen.exp
index 871abe23a79..a6f2572c06a 100644
--- a/gdb/testsuite/gdb.trace/packetlen.exp
+++ b/gdb/testsuite/gdb.trace/packetlen.exp
@@ -49,7 +49,7 @@ if [istarget "m68k-*-elf"] then {
 } else {
     set testfile "actions"
     set srcfile ${testfile}.c
-    set binfile $objdir/$subdir/$testfile
+    set binfile $objdir/$subdir/packetlen
     if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	    executable {debug nowarnings}] != "" } {
 	untested packetlen.exp
diff --git a/gdb/testsuite/gdb.trace/passc-dyn.exp b/gdb/testsuite/gdb.trace/passc-dyn.exp
index 1be9e909a1a..29f95a078a0 100644
--- a/gdb/testsuite/gdb.trace/passc-dyn.exp
+++ b/gdb/testsuite/gdb.trace/passc-dyn.exp
@@ -48,7 +48,7 @@ if [istarget "m68k-*-elf"] then {
 } else {
     set testfile "actions"
     set srcfile ${testfile}.c
-    set binfile $objdir/$subdir/$testfile
+    set binfile $objdir/$subdir/passc-dyn
     if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	    executable {debug nowarnings}] != "" } {
 	untested passc-dyn.exp
diff --git a/gdb/testsuite/gdb.trace/passcount.exp b/gdb/testsuite/gdb.trace/passcount.exp
index 06fea8ec935..e01f7c3f3f1 100644
--- a/gdb/testsuite/gdb.trace/passcount.exp
+++ b/gdb/testsuite/gdb.trace/passcount.exp
@@ -32,7 +32,7 @@ if [istarget "m68k-*-elf"] then {
 } else {
     set testfile "actions"
     set srcfile ${testfile}.c
-    set binfile $objdir/$subdir/$testfile
+    set binfile $objdir/$subdir/passcount
     if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	    executable {debug nowarnings}] != "" } {
 	untested passcount.exp
diff --git a/gdb/testsuite/gdb.trace/report.exp b/gdb/testsuite/gdb.trace/report.exp
index e39b8c24a0e..f9030e3d45c 100644
--- a/gdb/testsuite/gdb.trace/report.exp
+++ b/gdb/testsuite/gdb.trace/report.exp
@@ -49,7 +49,7 @@ if [istarget "m68k-*-elf"] then {
 } else {
     set testfile "actions"
     set srcfile ${testfile}.c
-    set binfile $objdir/$subdir/$testfile
+    set binfile $objdir/$subdir/report
     if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	     executable {debug nowarnings}] != "" } {
 	untested report.exp
diff --git a/gdb/testsuite/gdb.trace/save-trace.exp b/gdb/testsuite/gdb.trace/save-trace.exp
index 2d86c1c6dac..1867847f702 100644
--- a/gdb/testsuite/gdb.trace/save-trace.exp
+++ b/gdb/testsuite/gdb.trace/save-trace.exp
@@ -33,7 +33,7 @@ if [istarget "m68k-*-elf"] then {
 } else {
     set testfile "actions"
     set srcfile ${testfile}.c
-    set binfile $objdir/$subdir/$testfile
+    set binfile $objdir/$subdir/save-trace
     if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	    executable {debug nowarnings}] != "" } {
 	untested save-trace.exp
diff --git a/gdb/testsuite/gdb.trace/tfind.exp b/gdb/testsuite/gdb.trace/tfind.exp
index 363fb7fce19..902a32e59c1 100644
--- a/gdb/testsuite/gdb.trace/tfind.exp
+++ b/gdb/testsuite/gdb.trace/tfind.exp
@@ -50,7 +50,7 @@ if [istarget "m68k-*-elf"] then {
 } else {
     set testfile "actions"
     set srcfile ${testfile}.c
-    set binfile $objdir/$subdir/$testfile
+    set binfile $objdir/$subdir/tfind
 
     if { [gdb_compile "$srcdir/$subdir/$srcfile" "$binfile" \
 	    executable {debug nowarnings}] != "" } {
diff --git a/gdb/testsuite/gdb.trace/tracecmd.exp b/gdb/testsuite/gdb.trace/tracecmd.exp
index 74b241af3c8..edfc1e22854 100644
--- a/gdb/testsuite/gdb.trace/tracecmd.exp
+++ b/gdb/testsuite/gdb.trace/tracecmd.exp
@@ -32,7 +32,7 @@ if [istarget "m68k-*-elf"] then {
 } else {
     set testfile "actions"
     set srcfile ${testfile}.c
-    set binfile $objdir/$subdir/$testfile
+    set binfile $objdir/$subdir/tracecmd
     if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	    executable {debug nowarnings}] != "" } {
 	untested tracecmd.exp
diff --git a/gdb/testsuite/gdb.trace/while-dyn.exp b/gdb/testsuite/gdb.trace/while-dyn.exp
index e8a3db75604..e9d6565bae6 100644
--- a/gdb/testsuite/gdb.trace/while-dyn.exp
+++ b/gdb/testsuite/gdb.trace/while-dyn.exp
@@ -50,7 +50,7 @@ if [istarget "m68k-*-elf"] then {
 } else {
     set testfile "actions"
     set srcfile $testfile.c
-    set binfile $objdir/$subdir/$testfile
+    set binfile $objdir/$subdir/while-dyn
     if { [gdb_compile "$srcdir/$subdir/$srcfile" $binfile \
 	    executable {debug nowarnings}] != "" } {
 	untested while-dyn.exp
diff --git a/gdb/testsuite/gdb.trace/while-stepping.exp b/gdb/testsuite/gdb.trace/while-stepping.exp
index 2cbe6a89941..3cf1e33378d 100644
--- a/gdb/testsuite/gdb.trace/while-stepping.exp
+++ b/gdb/testsuite/gdb.trace/while-stepping.exp
@@ -33,7 +33,7 @@ if [istarget "m68k-*-elf"] then {
 } else {
     set testfile "actions"
     set srcfile ${testfile}.c
-    set binfile ${objdir}/${subdir}/${testfile}
+    set binfile ${objdir}/${subdir}/while-stepping
     if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" $binfile \
 	    executable {debug nowarnings}] != "" } {
 	untested while-stepping.exp
-- 
2.39.2