* gdb.mi/dw2-ref-missing-frame.exp: Use standard_testfile,

	standard_output_file.
	* gdb.mi/gdb2549.exp: Use standard_testfile.
	* gdb.mi/gdb669.exp: Use standard_testfile.
	* gdb.mi/gdb701.exp: Use standard_testfile.
	* gdb.mi/gdb792.exp: Use standard_testfile.
	* gdb.mi/mi-async.exp: Use standard_testfile.
	* gdb.mi/mi-basics.exp: Use standard_testfile.
	* gdb.mi/mi-break.exp: Use standard_testfile.
	* gdb.mi/mi-cli.exp: Use standard_testfile.
	* gdb.mi/mi-console.exp: Use standard_testfile.
	* gdb.mi/mi-disassemble.exp: Use standard_testfile.
	* gdb.mi/mi-eval.exp: Use standard_testfile.
	* gdb.mi/mi-file-transfer.exp: Use standard_testfile.
	* gdb.mi/mi-file.exp: Use standard_testfile.
	* gdb.mi/mi-inheritance-syntax-error.exp: Use standard_testfile.
	* gdb.mi/mi-logging.exp: Use standard_testfile.
	* gdb.mi/mi-nonstop-exit.exp: Use standard_testfile.
	* gdb.mi/mi-nonstop.exp: Use standard_testfile.
	* gdb.mi/mi-ns-stale-regcache.exp: Use standard_testfile.
	* gdb.mi/mi-nsintrall.exp: Use standard_testfile.
	* gdb.mi/mi-nsmoribund.exp: Use standard_testfile.
	* gdb.mi/mi-nsthrexec.exp: Use standard_testfile.
	* gdb.mi/mi-pending.exp: Use standard_testfile,
	standard_output_file.
	* gdb.mi/mi-pthreads.exp: Use standard_testfile.
	* gdb.mi/mi-read-memory.exp: Use standard_testfile.
	* gdb.mi/mi-regs.exp: Use standard_testfile.
	* gdb.mi/mi-return.exp: Use standard_testfile.
	* gdb.mi/mi-reverse.exp: Use standard_testfile.
	* gdb.mi/mi-simplerun.exp: Use standard_testfile.
	* gdb.mi/mi-solib.exp: Use standard_testfile,
	standard_output_file.
	* gdb.mi/mi-stack.exp: Use standard_testfile.
	* gdb.mi/mi-stepi.exp: Use standard_testfile.
	* gdb.mi/mi-stepn.exp: Use standard_testfile.
	* gdb.mi/mi-syn-frame.exp: Use standard_testfile.
	* gdb.mi/mi-until.exp: Use standard_testfile.
	* gdb.mi/mi-var-block.exp: Use standard_testfile.
	* gdb.mi/mi-var-child-f.exp: Use standard_testfile.
	* gdb.mi/mi-var-child.exp: Use standard_testfile.
	* gdb.mi/mi-var-cmd.exp: Use standard_testfile.
	* gdb.mi/mi-var-cp.exp: Use standard_testfile.
	* gdb.mi/mi-var-display.exp: Use standard_testfile.
	* gdb.mi/mi-var-invalidate.exp: Use standard_testfile,
	standard_output_file.
	* gdb.mi/mi-var-rtti.exp: Use standard_testfile.
	* gdb.mi/mi-watch-nonstop.exp: Use standard_testfile.
	* gdb.mi/mi-watch.exp: Use standard_testfile.
	* gdb.mi/mi2-amd64-entry-value.exp: Use standard_testfile.
	* gdb.mi/mi2-basics.exp: Use standard_testfile.
	* gdb.mi/mi2-break.exp: Use standard_testfile.
	* gdb.mi/mi2-cli.exp: Use standard_testfile.
	* gdb.mi/mi2-console.exp: Use standard_testfile.
	* gdb.mi/mi2-disassemble.exp: Use standard_testfile.
	* gdb.mi/mi2-eval.exp: Use standard_testfile.
	* gdb.mi/mi2-file.exp: Use standard_testfile.
	* gdb.mi/mi2-pthreads.exp: Use standard_testfile.
	* gdb.mi/mi2-read-memory.exp: Use standard_testfile.
	* gdb.mi/mi2-regs.exp: Use standard_testfile.
	* gdb.mi/mi2-return.exp: Use standard_testfile.
	* gdb.mi/mi2-simplerun.exp: Use standard_testfile.
	* gdb.mi/mi2-stack.exp: Use standard_testfile.
	* gdb.mi/mi2-stepi.exp: Use standard_testfile.
	* gdb.mi/mi2-syn-frame.exp: Use standard_testfile.
	* gdb.mi/mi2-until.exp: Use standard_testfile.
	* gdb.mi/mi2-var-block.exp: Use standard_testfile.
	* gdb.mi/mi2-var-child.exp: Use standard_testfile.
	* gdb.mi/mi2-var-cmd.exp: Use standard_testfile.
	* gdb.mi/mi2-var-display.exp: Use standard_testfile.
	* gdb.mi/mi2-watch.exp: Use standard_testfile.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index e3fae5e2bfb5c941c9a63f7d46cf6b22c1a20a54..8b933e9af2749e7c56499b7bd1f1a236d3aa2996 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,77 @@
+2012-07-10  Tom Tromey  <tromey@redhat.com>
+
+       * gdb.mi/dw2-ref-missing-frame.exp: Use standard_testfile,
+       standard_output_file.
+       * gdb.mi/gdb2549.exp: Use standard_testfile.
+       * gdb.mi/gdb669.exp: Use standard_testfile.
+       * gdb.mi/gdb701.exp: Use standard_testfile.
+       * gdb.mi/gdb792.exp: Use standard_testfile.
+       * gdb.mi/mi-async.exp: Use standard_testfile.
+       * gdb.mi/mi-basics.exp: Use standard_testfile.
+       * gdb.mi/mi-break.exp: Use standard_testfile.
+       * gdb.mi/mi-cli.exp: Use standard_testfile.
+       * gdb.mi/mi-console.exp: Use standard_testfile.
+       * gdb.mi/mi-disassemble.exp: Use standard_testfile.
+       * gdb.mi/mi-eval.exp: Use standard_testfile.
+       * gdb.mi/mi-file-transfer.exp: Use standard_testfile.
+       * gdb.mi/mi-file.exp: Use standard_testfile.
+       * gdb.mi/mi-inheritance-syntax-error.exp: Use standard_testfile.
+       * gdb.mi/mi-logging.exp: Use standard_testfile.
+       * gdb.mi/mi-nonstop-exit.exp: Use standard_testfile.
+       * gdb.mi/mi-nonstop.exp: Use standard_testfile.
+       * gdb.mi/mi-ns-stale-regcache.exp: Use standard_testfile.
+       * gdb.mi/mi-nsintrall.exp: Use standard_testfile.
+       * gdb.mi/mi-nsmoribund.exp: Use standard_testfile.
+       * gdb.mi/mi-nsthrexec.exp: Use standard_testfile.
+       * gdb.mi/mi-pending.exp: Use standard_testfile,
+       standard_output_file.
+       * gdb.mi/mi-pthreads.exp: Use standard_testfile.
+       * gdb.mi/mi-read-memory.exp: Use standard_testfile.
+       * gdb.mi/mi-regs.exp: Use standard_testfile.
+       * gdb.mi/mi-return.exp: Use standard_testfile.
+       * gdb.mi/mi-reverse.exp: Use standard_testfile.
+       * gdb.mi/mi-simplerun.exp: Use standard_testfile.
+       * gdb.mi/mi-solib.exp: Use standard_testfile,
+       standard_output_file.
+       * gdb.mi/mi-stack.exp: Use standard_testfile.
+       * gdb.mi/mi-stepi.exp: Use standard_testfile.
+       * gdb.mi/mi-stepn.exp: Use standard_testfile.
+       * gdb.mi/mi-syn-frame.exp: Use standard_testfile.
+       * gdb.mi/mi-until.exp: Use standard_testfile.
+       * gdb.mi/mi-var-block.exp: Use standard_testfile.
+       * gdb.mi/mi-var-child-f.exp: Use standard_testfile.
+       * gdb.mi/mi-var-child.exp: Use standard_testfile.
+       * gdb.mi/mi-var-cmd.exp: Use standard_testfile.
+       * gdb.mi/mi-var-cp.exp: Use standard_testfile.
+       * gdb.mi/mi-var-display.exp: Use standard_testfile.
+       * gdb.mi/mi-var-invalidate.exp: Use standard_testfile,
+       standard_output_file.
+       * gdb.mi/mi-var-rtti.exp: Use standard_testfile.
+       * gdb.mi/mi-watch-nonstop.exp: Use standard_testfile.
+       * gdb.mi/mi-watch.exp: Use standard_testfile.
+       * gdb.mi/mi2-amd64-entry-value.exp: Use standard_testfile.
+       * gdb.mi/mi2-basics.exp: Use standard_testfile.
+       * gdb.mi/mi2-break.exp: Use standard_testfile.
+       * gdb.mi/mi2-cli.exp: Use standard_testfile.
+       * gdb.mi/mi2-console.exp: Use standard_testfile.
+       * gdb.mi/mi2-disassemble.exp: Use standard_testfile.
+       * gdb.mi/mi2-eval.exp: Use standard_testfile.
+       * gdb.mi/mi2-file.exp: Use standard_testfile.
+       * gdb.mi/mi2-pthreads.exp: Use standard_testfile.
+       * gdb.mi/mi2-read-memory.exp: Use standard_testfile.
+       * gdb.mi/mi2-regs.exp: Use standard_testfile.
+       * gdb.mi/mi2-return.exp: Use standard_testfile.
+       * gdb.mi/mi2-simplerun.exp: Use standard_testfile.
+       * gdb.mi/mi2-stack.exp: Use standard_testfile.
+       * gdb.mi/mi2-stepi.exp: Use standard_testfile.
+       * gdb.mi/mi2-syn-frame.exp: Use standard_testfile.
+       * gdb.mi/mi2-until.exp: Use standard_testfile.
+       * gdb.mi/mi2-var-block.exp: Use standard_testfile.
+       * gdb.mi/mi2-var-child.exp: Use standard_testfile.
+       * gdb.mi/mi2-var-cmd.exp: Use standard_testfile.
+       * gdb.mi/mi2-var-display.exp: Use standard_testfile.
+       * gdb.mi/mi2-watch.exp: Use standard_testfile.
+
 2012-07-10  Tom Tromey  <tromey@redhat.com>
 
        * gdb.cp/abstract-origin.exp: Use standard_testfile.

diff --git a/gdb/testsuite/gdb.mi/dw2-ref-missing-frame.exp b/gdb/testsuite/gdb.mi/dw2-ref-missing-frame.exp
index 662bded281f9cc2258f1f8f15095ec79f9deefbb..187cd12f9ce5a0d2b362fb9adf3189d51231600f 100644 (file)
--- a/gdb/testsuite/gdb.mi/dw2-ref-missing-frame.exp
+++ b/gdb/testsuite/gdb.mi/dw2-ref-missing-frame.exp
@@ -22,19 +22,14 @@ if {![dwarf2_support]} {
     return 0
 }
 
-set testfile "dw2-ref-missing-frame"
-set srcsfile ${testfile}.S
-set objsfile ${objdir}/${subdir}/${testfile}.o
-set srcfuncfile ${testfile}-func.c
-set objfuncfile ${objdir}/${subdir}/${testfile}-func.o
-set srcmainfile ${testfile}-main.c
-set objmainfile ${objdir}/${subdir}/${testfile}-main.o
-set executable ${testfile}
-set binfile ${objdir}/${subdir}/${executable}
+standard_testfile .S dw2-ref-missing-frame-func.c dw2-ref-missing-frame-main.c
+set objsfile [standard_output_file ${testfile}.o]
+set objfuncfile [standard_output_file ${testfile}-func.o]
+set objmainfile [standard_output_file ${testfile}-main.o]
 
-if { [gdb_compile "${srcdir}/${subdir}/${srcsfile}" $objsfile object {}] != ""
-     || [gdb_compile "${srcdir}/${subdir}/${srcfuncfile}" $objfuncfile object {}] != ""
-     || [gdb_compile "${srcdir}/${subdir}/${srcmainfile}" $objmainfile object {debug}] != ""
+if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" $objsfile object {}] != ""
+     || [gdb_compile "${srcdir}/${subdir}/${srcfile2}" $objfuncfile object {}] != ""
+     || [gdb_compile "${srcdir}/${subdir}/${srcfile3}" $objmainfile object {debug}] != ""
      || [gdb_compile "$objsfile $objfuncfile $objmainfile" $binfile executable {}] != "" } {
     return -1
 }

diff --git a/gdb/testsuite/gdb.mi/gdb2549.exp b/gdb/testsuite/gdb.mi/gdb2549.exp
index bf536de9722c178d0441d3bd0f77937566858117..9af04dd85f3a6663fbceafd914834ed90859655e 100644 (file)
--- a/gdb/testsuite/gdb.mi/gdb2549.exp
+++ b/gdb/testsuite/gdb.mi/gdb2549.exp
@@ -30,9 +30,8 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile "basics"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile basics.c
+
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
      untested mi-regs.exp
      return -1

diff --git a/gdb/testsuite/gdb.mi/gdb669.exp b/gdb/testsuite/gdb.mi/gdb669.exp
index 904f14d0e1fa0b17eac5606eec87c591e810a813..2ca173cc09406d473a9a04ed5b7ba3223c36143a 100644 (file)
--- a/gdb/testsuite/gdb.mi/gdb669.exp
+++ b/gdb/testsuite/gdb.mi/gdb669.exp
@@ -28,11 +28,9 @@ if {[mi_gdb_start]} {
 #
 # Start here
 #
-set testfile "pthreads"
-set srcfile "$testfile.c"
-set binfile "$objdir/$subdir/gdb669-$testfile"
+standard_testfile pthreads.c
 
-set options [list debug incdir=$objdir]
+set options [list debug]
 if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable $options] != "" } {
     return -1
 }

diff --git a/gdb/testsuite/gdb.mi/gdb701.exp b/gdb/testsuite/gdb.mi/gdb701.exp
index cda54a80db7a8d173d94e3fa133164294e223a95..8de7adcd9eae99e23689ff49dc47a7b136eca3ac 100644 (file)
--- a/gdb/testsuite/gdb.mi/gdb701.exp
+++ b/gdb/testsuite/gdb.mi/gdb701.exp
@@ -25,9 +25,8 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile gdb701
-set srcfile "$testfile.c"
-set binfile $objdir/$subdir/$testfile
+standard_testfile
+
 if {[gdb_compile $srcdir/$subdir/$srcfile $binfile executable debug] != ""} {
   untested gdb701.exp
   return -1

diff --git a/gdb/testsuite/gdb.mi/gdb792.exp b/gdb/testsuite/gdb.mi/gdb792.exp
index 25909df53d98604d5d7763961a6cfb305e774a79..1cb7ae2f61ded5bc577e4935f8987ae263253f7b 100644 (file)
--- a/gdb/testsuite/gdb.mi/gdb792.exp
+++ b/gdb/testsuite/gdb.mi/gdb792.exp
@@ -27,9 +27,7 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile gdb792
-set srcfile "$testfile.cc"
-set binfile $objdir/$subdir/$testfile
+standard_testfile .cc
 
 if [get_compiler_info "c++"] {
     return -1;

diff --git a/gdb/testsuite/gdb.mi/mi-async.exp b/gdb/testsuite/gdb.mi/mi-async.exp
index bab76738643df05b3aa761c31ec5a4f93cd72240..1d6b3777c1572b31312361be656ca0e4f8597495 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-async.exp
+++ b/gdb/testsuite/gdb.mi/mi-async.exp
@@ -36,9 +36,8 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile "basics"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/mi-async
+standard_testfile basics.c
+
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
      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 9ff27b469d27f74012eebf34b3e2a2307a4d5a53..564b835f06dadabfd133921bf485302206c75346 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-basics.exp
+++ b/gdb/testsuite/gdb.mi/mi-basics.exp
@@ -33,9 +33,7 @@ if [mi_gdb_start separate-inferior-tty] {
     continue
 }
 
-set testfile "basics"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/mi-basics
+standard_testfile basics.c
 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 debfe86e993fbb3fce3e3c492a586548f67dcc5d..573f484c6c66afdd96fbf58683aff981f5c1ed1e 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-break.exp
+++ b/gdb/testsuite/gdb.mi/mi-break.exp
@@ -32,9 +32,8 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile "basics"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/mi-break
+standard_testfile basics.c
+
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
      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 598365b4a0aceab97a8fbe51166c532fa49f2c11..b7abbc72390bab21497833cdc70a712d7f97bf13 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-cli.exp
+++ b/gdb/testsuite/gdb.mi/mi-cli.exp
@@ -27,9 +27,8 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile "basics"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/mi-cli
+standard_testfile basics.c
+
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
      untested mi-cli.exp
      return -1

diff --git a/gdb/testsuite/gdb.mi/mi-console.exp b/gdb/testsuite/gdb.mi/mi-console.exp
index 83deff5ceb904af55e0a576ddc3c48345cf8a2ec..891c7437e3d2e0deeea057c1362fea2c685994c4 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-console.exp
+++ b/gdb/testsuite/gdb.mi/mi-console.exp
@@ -36,9 +36,8 @@ if [mi_gdb_start separate-inferior-tty] {
     continue
 }
 
-set testfile "mi-console"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile
+
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
      untested mi-console.exp
      return -1

diff --git a/gdb/testsuite/gdb.mi/mi-disassemble.exp b/gdb/testsuite/gdb.mi/mi-disassemble.exp
index 68038ae29160e9c02ee281c19a46360669dbd7a5..377ffdeeb01c6cb172db204051eaee87f2876a13 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-disassemble.exp
+++ b/gdb/testsuite/gdb.mi/mi-disassemble.exp
@@ -29,9 +29,8 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile "basics"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/mi-disassemble
+standard_testfile basics.c
+
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
      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 29d26a2a4fae8b0c4d7052e292e845422f2036c0..ea20369dc20a6465507aa7f405c14c2a32c48432 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-eval.exp
+++ b/gdb/testsuite/gdb.mi/mi-eval.exp
@@ -30,9 +30,8 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile "basics"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/mi-eval
+standard_testfile basics.c
+
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
      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 74b38e96ed22b805f1f59a2f8d681618016a967d..a7a3e60a2ff73edbe932cc08ecc28a13fdb6c448 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-file-transfer.exp
+++ b/gdb/testsuite/gdb.mi/mi-file-transfer.exp
@@ -24,9 +24,8 @@ if { [skip_gdbserver_tests] } {
     return 0
 }
 
-set testfile "basics"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/mi-file-transfer
+standard_testfile basics.c
+
 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 37331074aeafbb85fdd8f1e9ea9c3daed589b2a8..b0df2cde1794672005d9a7dbd899321d258e6438 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-file.exp
+++ b/gdb/testsuite/gdb.mi/mi-file.exp
@@ -32,9 +32,8 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile "basics"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/mi-file
+standard_testfile basics.c
+
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
      untested mi-file.exp
      return -1

diff --git a/gdb/testsuite/gdb.mi/mi-inheritance-syntax-error.exp b/gdb/testsuite/gdb.mi/mi-inheritance-syntax-error.exp
index a705e2855fc77d2922c05da98fb5fc3cd0d01950..ba80f4f96017847fa5ffedb0c9715a5fd7040e7d 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-inheritance-syntax-error.exp
+++ b/gdb/testsuite/gdb.mi/mi-inheritance-syntax-error.exp
@@ -23,9 +23,7 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile mi-inheritance-syntax-error
-set srcfile "$testfile.cc"
-set binfile $objdir/$subdir/$testfile
+standard_testfile .cc
 
 if [get_compiler_info "c++"] {
     return -1;

diff --git a/gdb/testsuite/gdb.mi/mi-logging.exp b/gdb/testsuite/gdb.mi/mi-logging.exp
index d62bfe6bc1f5a8c8ed17c14570b57a581ede7cc8..2c533bd1a37b13a6ef0d4b21ea947e792e3c0bc0 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-logging.exp
+++ b/gdb/testsuite/gdb.mi/mi-logging.exp
@@ -21,13 +21,10 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile basics
-set srcfile "$testfile.c"
-set executable ${testfile}
-set binfile $objdir/$subdir/$testfile
+standard_testfile basics.c
 set opts {debug}
 
-if [build_executable $testfile.exp $executable $srcfile $opts] {
+if [build_executable $testfile.exp $testfile $srcfile $opts] {
     untested mi-logging.exp
     return -1;
 }

diff --git a/gdb/testsuite/gdb.mi/mi-nonstop-exit.exp b/gdb/testsuite/gdb.mi/mi-nonstop-exit.exp
index b6f572879f1450a864e7a4271323fe662802834a..fe7654e84a84239a716df15721f5d8de5ca5ab45 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-nonstop-exit.exp
+++ b/gdb/testsuite/gdb.mi/mi-nonstop-exit.exp
@@ -29,11 +29,9 @@ if {[mi_gdb_start]} {
 #
 # Start here
 #
-set testfile "non-stop-exit"
-set srcfile "$testfile.c"
-set binfile "$objdir/$subdir/mi-$testfile"
+standard_testfile non-stop-exit.c
 
-set options [list debug incdir=$objdir]
+set options [list debug]
 if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable $options] != "" } {
     return -1
 }

diff --git a/gdb/testsuite/gdb.mi/mi-nonstop.exp b/gdb/testsuite/gdb.mi/mi-nonstop.exp
index 1c57643c738b39eeeb2663a2efe9c51a571357d8..f96799f41fd4009b6b2bc50d0711e6b99a0e263e 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-nonstop.exp
+++ b/gdb/testsuite/gdb.mi/mi-nonstop.exp
@@ -39,11 +39,9 @@ proc mi_nonstop_resume { command test } {
 #
 # Start here
 #
-set testfile "non-stop"
-set srcfile "$testfile.c"
-set binfile "$objdir/$subdir/mi-$testfile"
+standard_testfile non-stop.c
 
-set options [list debug incdir=$objdir]
+set options [list debug]
 if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable $options] != "" } {
     return -1
 }

diff --git a/gdb/testsuite/gdb.mi/mi-ns-stale-regcache.exp b/gdb/testsuite/gdb.mi/mi-ns-stale-regcache.exp
index c5cf8cf968552e3ee6189ca1cf69070fa90172ab..8cf5b6cf5c8ff539447b70835b79a0cde534a465 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-ns-stale-regcache.exp
+++ b/gdb/testsuite/gdb.mi/mi-ns-stale-regcache.exp
@@ -41,11 +41,9 @@ proc mi_nonstop_resume { command test } {
 #
 # Start here
 #
-set testfile "ns-stale-regcache"
-set srcfile "$testfile.c"
-set binfile "$objdir/$subdir/mi-$testfile"
+standard_testfile ns-stale-regcache.c
 
-set options [list debug incdir=$objdir]
+set options [list debug]
 if {[gdb_compile "$srcdir/$subdir/$srcfile" \
         $binfile executable $options] != "" } {
     return -1

diff --git a/gdb/testsuite/gdb.mi/mi-nsintrall.exp b/gdb/testsuite/gdb.mi/mi-nsintrall.exp
index ccdce5c38a430062e17e5dea9162335452538621..1d4aba5dec582e8112c67cb66174370e79675a00 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-nsintrall.exp
+++ b/gdb/testsuite/gdb.mi/mi-nsintrall.exp
@@ -29,11 +29,9 @@ if {[mi_gdb_start]} {
 #
 # Start here
 #
-set testfile "nsintrall"
-set srcfile "$testfile.c"
-set binfile "$objdir/$subdir/mi-$testfile"
+standard_testfile nsintrall.c
 
-set options [list debug incdir=$objdir]
+set options [list debug]
 if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable $options] != "" } {
     return -1
 }

diff --git a/gdb/testsuite/gdb.mi/mi-nsmoribund.exp b/gdb/testsuite/gdb.mi/mi-nsmoribund.exp
index 36e70d3738d8ade144d7d60bd4f0c1fa6c0b3eb9..0c83bb9f4ac1f02e304919d0dd6745d764e494b6 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-nsmoribund.exp
+++ b/gdb/testsuite/gdb.mi/mi-nsmoribund.exp
@@ -29,11 +29,9 @@ if {[mi_gdb_start]} {
 #
 # Start here
 #
-set testfile "nsmoribund"
-set srcfile "$testfile.c"
-set binfile "$objdir/$subdir/mi-$testfile"
+standard_testfile nsmoribund.c
 
-set options [list debug incdir=$objdir]
+set options [list debug]
 if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable $options] != "" } {
     return -1
 }

diff --git a/gdb/testsuite/gdb.mi/mi-nsthrexec.exp b/gdb/testsuite/gdb.mi/mi-nsthrexec.exp
index 921fcf04a7e194b4b108c286cc72c2450bfbbe0d..28ca7fc0c3ecc662ee3d65d45c6f2dafa1de4d21 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-nsthrexec.exp
+++ b/gdb/testsuite/gdb.mi/mi-nsthrexec.exp
@@ -39,11 +39,9 @@ if {[mi_gdb_start]} {
 #
 # Start here
 #
-set testfile "nsthrexec"
-set srcfile "$testfile.c"
-set binfile "$objdir/$subdir/mi-$testfile"
+standard_testfile nsthrexec.c
 
-set options [list debug incdir=$objdir]
+set options [list debug]
 if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable $options] != "" } {
     return -1
 }

diff --git a/gdb/testsuite/gdb.mi/mi-pending.exp b/gdb/testsuite/gdb.mi/mi-pending.exp
index 8bfa4e56ff5bd97b5cd934755a66a6a2616bfacd..f39ab71d30135f1d4aba46cbb281e18b17310c9a 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-pending.exp
+++ b/gdb/testsuite/gdb.mi/mi-pending.exp
@@ -24,12 +24,8 @@ if {[skip_shlib_tests]} {
     return 0
 }
 
-set testfile "mi-pending"
-set libfile "mi-pendshr"
-set srcfile $testfile.c
-set libsrc  $srcdir/$subdir/$libfile.c
-set binfile $objdir/$subdir/$testfile
-set lib_sl  $objdir/$subdir/$libfile.sl
+standard_testfile mi-pending.c mi-pendshr.c
+set lib_sl [standard_output_file mi-pendshr.sl]
 
 set lib_opts  debug
 set exec_opts [list debug shlib=$lib_sl]
@@ -38,7 +34,7 @@ if [get_compiler_info] {
     return -1
 }
 
-if { [gdb_compile_shlib $libsrc $lib_sl $lib_opts] != ""
+if { [gdb_compile_shlib $srcdir/$subdir/$srcfile2 $lib_sl $lib_opts] != ""
      || [gdb_compile $srcdir/$subdir/$srcfile $binfile executable $exec_opts] != ""} {
     untested "Could not compile either $libsrc or $srcdir/$subdir/$srcfile."
     return -1

diff --git a/gdb/testsuite/gdb.mi/mi-pthreads.exp b/gdb/testsuite/gdb.mi/mi-pthreads.exp
index 458d3fb4c7483473c26fd1343d4abd7f7dd30a33..d30e0f2c0482539bf23a15cf8e7374026aeb4d7c 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-pthreads.exp
+++ b/gdb/testsuite/gdb.mi/mi-pthreads.exp
@@ -61,11 +61,9 @@ proc check_mi_thread_command_set {} {
 #
 # Start here
 #
-set testfile "pthreads"
-set srcfile "$testfile.c"
-set binfile "$objdir/$subdir/mi-$testfile"
+standard_testfile pthreads.c
 
-set options [list debug incdir=$objdir]
+set options [list debug]
 if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable $options] != "" } {
     return -1
 }

diff --git a/gdb/testsuite/gdb.mi/mi-read-memory.exp b/gdb/testsuite/gdb.mi/mi-read-memory.exp
index af34de8493a5e399f42a5784feb46ee8c034287f..5d154ba7c58be546d40ec611e4b3a813cb34c3d8 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-read-memory.exp
+++ b/gdb/testsuite/gdb.mi/mi-read-memory.exp
@@ -33,9 +33,8 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile "mi-read-memory"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile
+
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
      untested mi-read-memory.exp
      return -1

diff --git a/gdb/testsuite/gdb.mi/mi-regs.exp b/gdb/testsuite/gdb.mi/mi-regs.exp
index 876de78b98d4a9af5d7e8c3a0555d604bb437a17..988f0c529966d69f506f254f6e9dfd11239161f7 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-regs.exp
+++ b/gdb/testsuite/gdb.mi/mi-regs.exp
@@ -30,9 +30,8 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile "basics"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/mi-regs
+standard_testfile basics.c
+
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
      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 b7d931f0276446298c03b20c719078ba6423fc6f..e6b4e61e7e888b30178505b256ec559842600bee 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-return.exp
+++ b/gdb/testsuite/gdb.mi/mi-return.exp
@@ -31,9 +31,8 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile "basics"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/mi-return
+standard_testfile basics.c
+
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
      untested mi-return.exp
      return -1

diff --git a/gdb/testsuite/gdb.mi/mi-reverse.exp b/gdb/testsuite/gdb.mi/mi-reverse.exp
index 17bbb43e48e16d84847b1989ffb6964e4d2f2476..f65493dfb799e687f708e8967c5b57e75214a700 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-reverse.exp
+++ b/gdb/testsuite/gdb.mi/mi-reverse.exp
@@ -39,9 +39,8 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile mi-reverse
-set srcfile basics.c
-set binfile ${objdir}/${subdir}/mi2-reverse
+standard_testfile basics.c
+
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
      untested ${testfile}.exp
      return -1

diff --git a/gdb/testsuite/gdb.mi/mi-simplerun.exp b/gdb/testsuite/gdb.mi/mi-simplerun.exp
index 52aa0d7ad07a8fc4d0cb03ef864e0663e47bfbda..a20d0880eac05b9cb6b0d3a39f7655a21a7aac94 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-simplerun.exp
+++ b/gdb/testsuite/gdb.mi/mi-simplerun.exp
@@ -32,9 +32,8 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile "basics"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/mi-simplerun
+standard_testfile basics.c
+
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
      untested mi-simplerun.exp
      return -1

diff --git a/gdb/testsuite/gdb.mi/mi-solib.exp b/gdb/testsuite/gdb.mi/mi-solib.exp
index bee6a5d74f199a5f03f0023ed7d57de9d2895da4..cec4b84fdb29d9dfad3cc1298082ba4682719d93 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-solib.exp
+++ b/gdb/testsuite/gdb.mi/mi-solib.exp
@@ -26,14 +26,14 @@ if [mi_gdb_start] {
     continue
 }
 
+standard_testfile solib-main.c solib-lib.c
+
 set libname "solib-lib"
-set srcfile_lib ${srcdir}/${subdir}/${libname}.c
-set binfile_lib ${objdir}/${subdir}/${libname}.so
+set srcfile_lib ${srcdir}/${subdir}/$srcfile2
+set binfile_lib [standard_output_file ${libname}.so]
 set lib_flags [list debug]
 
-set testfile "solib-main"
-set srcfile ${srcdir}/${subdir}/${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+set srcfile_main ${srcdir}/${subdir}/$srcfile
 set bin_flags [list debug shlib=${binfile_lib}]
 
 if [get_compiler_info] {
@@ -41,7 +41,7 @@ if [get_compiler_info] {
 }
 
 if { [gdb_compile_shlib ${srcfile_lib} ${binfile_lib} $lib_flags] != ""
-     || [gdb_compile ${srcfile} ${binfile} executable $bin_flags] != "" } {
+     || [gdb_compile ${srcfile_main} ${binfile} executable $bin_flags] != "" } {
   untested "Could not compile $binfile_lib or $binfile."
   return -1
 }

diff --git a/gdb/testsuite/gdb.mi/mi-stack.exp b/gdb/testsuite/gdb.mi/mi-stack.exp
index f3fcd45d74fc4920d96204b524599284e4ee68c1..d743c68d5ad55fc3dff89f837ea39cdf62d1a0eb 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-stack.exp
+++ b/gdb/testsuite/gdb.mi/mi-stack.exp
@@ -31,9 +31,8 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile "mi-stack"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile
+
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
      untested mi-stack.exp
      return -1

diff --git a/gdb/testsuite/gdb.mi/mi-stepi.exp b/gdb/testsuite/gdb.mi/mi-stepi.exp
index 5e119a3f8019b3b86b45f7ce5a326e12edecf70b..245dc1c37e0d3b373554378c754b468cd1aed90a 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-stepi.exp
+++ b/gdb/testsuite/gdb.mi/mi-stepi.exp
@@ -31,9 +31,8 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile "basics"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/mi-stepi
+standard_testfile basics.c
+
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
      untested mi-stepi.exp
      return -1

diff --git a/gdb/testsuite/gdb.mi/mi-stepn.exp b/gdb/testsuite/gdb.mi/mi-stepn.exp
index f72387281e6fc0fee4b95e0f495861740b539bbd..4333cfe40c4e6e47579c9559c99139100e232d25 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-stepn.exp
+++ b/gdb/testsuite/gdb.mi/mi-stepn.exp
@@ -24,13 +24,10 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile "mi-stepn"
-set srcfile ${testfile}.c
-set executable ${testfile}
-set binfile ${objdir}/${subdir}/${executable}
+standard_testfile
 
 set opts {debug}
-if [build_executable ${testfile}.exp ${executable} ${srcfile} $opts] {
+if [build_executable ${testfile}.exp ${testfile} ${srcfile} $opts] {
     return -1
 }
 

diff --git a/gdb/testsuite/gdb.mi/mi-syn-frame.exp b/gdb/testsuite/gdb.mi/mi-syn-frame.exp
index 34771abf30a831a8a07e03893476aff5730e2a18..a19deb94b52a95f261e0ff562401cc9a98b95e96 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-syn-frame.exp
+++ b/gdb/testsuite/gdb.mi/mi-syn-frame.exp
@@ -24,9 +24,8 @@ if [target_info exists gdb,nosignals] {
 load_lib mi-support.exp
 set MIFLAGS "-i=mi"
 
-set testfile "mi-syn-frame"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile
+
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
      untested mi-syn-frame.exp
      return -1

diff --git a/gdb/testsuite/gdb.mi/mi-until.exp b/gdb/testsuite/gdb.mi/mi-until.exp
index 56d914fc85d73fd60c9fadbc1234751abd857d49..a1c97b1c94d0885b472a03d7834542d7c4a434dd 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-until.exp
+++ b/gdb/testsuite/gdb.mi/mi-until.exp
@@ -30,9 +30,8 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile "until"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile until.c
+
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
      untested mi-until.exp
      return -1

diff --git a/gdb/testsuite/gdb.mi/mi-var-block.exp b/gdb/testsuite/gdb.mi/mi-var-block.exp
index 601057ae4f2a34ef249124d27fa7749a571dbc1a..e2eb42f73f807a84e6ab48dabb26b99e68945567 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-var-block.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-block.exp
@@ -27,9 +27,8 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile "var-cmd"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/mi-var-block
+standard_testfile var-cmd.c
+
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
     untested mi-var-block.exp
     return -1

diff --git a/gdb/testsuite/gdb.mi/mi-var-child-f.exp b/gdb/testsuite/gdb.mi/mi-var-child-f.exp
index 9383f50bb2615047612f5809ac277ec052e977f5..052d7e243c78db19b9fddc3d93997c1a497c7c4f 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-var-child-f.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-child-f.exp
@@ -25,9 +25,8 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile "array"
-set srcfile ${testfile}.f
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile array.f
+
 if {[gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" \
         executable {debug f77}] != ""} {
     return -1

diff --git a/gdb/testsuite/gdb.mi/mi-var-child.exp b/gdb/testsuite/gdb.mi/mi-var-child.exp
index cd3133d2b1011bc0ddf47bf47f2c25d5776a1cc8..1d72311de0d3cf615cd118503eda21a50ac4378b 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-var-child.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-child.exp
@@ -28,9 +28,8 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile "mi-var-child"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile
+
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
     untested mi-var-child.exp
     return -1

diff --git a/gdb/testsuite/gdb.mi/mi-var-cmd.exp b/gdb/testsuite/gdb.mi/mi-var-cmd.exp
index 017e4f6ad91f7ccb224089ec9460c59daa85e478..4c560a7ebc96580581fb53ad52dd0a4a81f9b5b9 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-var-cmd.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-cmd.exp
@@ -28,9 +28,8 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile "var-cmd"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/mi-var-cmd
+standard_testfile var-cmd.c
+
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
     untested mi-var-cmd.exp
     return -1

diff --git a/gdb/testsuite/gdb.mi/mi-var-cp.exp b/gdb/testsuite/gdb.mi/mi-var-cp.exp
index 6ab5208639c173cccb281fb767866ea82d39609e..0ce4c4026cc90f328092235f45f97a0186969bfe 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-var-cp.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-cp.exp
@@ -23,9 +23,7 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile mi-var-cp
-set srcfile "$testfile.cc"
-set binfile $objdir/$subdir/$testfile
+standard_testfile .cc
 
 if [get_compiler_info "c++"] {
     return -1;

diff --git a/gdb/testsuite/gdb.mi/mi-var-display.exp b/gdb/testsuite/gdb.mi/mi-var-display.exp
index cf3ac80d406218705f7169893c37daff8da6e23d..5cb5f2600db5348b48ed8ca2da62f945d10386ae 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-var-display.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-display.exp
@@ -27,9 +27,8 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile "var-cmd"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/mi-var-display
+standard_testfile var-cmd.c
+
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
     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 adeb442c8e5cdc6951485d114e7c5ef58406f4ac..3ecbbdf67d818f18b3b6e33ba2e09de24e6ca822 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-var-invalidate.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-invalidate.exp
@@ -28,15 +28,14 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile "var-cmd"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/mi-var-invalidate
+standard_testfile var-cmd.c
+
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
     untested mi-var-invalidate.exp
     return -1
 }
 # Just change the output binary.
-set binfile_bis ${objdir}/${subdir}/mi-var-invalidate_bis
+set binfile_bis [standard_output_file mi-var-invalidate_bis]
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile_bis}" executable {debug}] != "" } {
     untested mi-var-invalidate.exp
     return -1
@@ -44,7 +43,7 @@ if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile_bis}" executable
 
 set testfile2 "basics"
 set srcfile2 ${testfile2}.c
-set binfile2 ${objdir}/${subdir}/${testfile2}
+set binfile2 [standard_output_file ${testfile2}]
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile2}" "${binfile2}" executable {debug}] != "" } {
     untested mi-var-invalidate.exp
     return -1

diff --git a/gdb/testsuite/gdb.mi/mi-var-rtti.exp b/gdb/testsuite/gdb.mi/mi-var-rtti.exp
index 5e43bae6dfee572e04ecbd9f3bf400b71fbfa168..a718ffba56ec29a5c4680aa69f1be729344233b3 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-var-rtti.exp
+++ b/gdb/testsuite/gdb.mi/mi-var-rtti.exp
@@ -23,13 +23,10 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile mi-var-rtti
-set srcfile "$testfile.cc"
-set executable ${testfile}
-set binfile $objdir/$subdir/$testfile
+standard_testfile .cc
 set opts {debug c++}
 
-if [build_executable $testfile.exp $executable $srcfile $opts] {
+if [build_executable $testfile.exp $testfile $srcfile $opts] {
     return -1;
 }
 

diff --git a/gdb/testsuite/gdb.mi/mi-watch-nonstop.exp b/gdb/testsuite/gdb.mi/mi-watch-nonstop.exp
index 018452ffe289edfabf6fbad0b4928c4a1606349d..c61b519ec9f878f4d1ed04b29cc20e0434942df0 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-watch-nonstop.exp
+++ b/gdb/testsuite/gdb.mi/mi-watch-nonstop.exp
@@ -42,9 +42,7 @@ proc mi_nonstop_resume { command test } {
 #
 # Start here
 #
-set testfile "watch-nonstop"
-set srcfile "$testfile.c"
-set binfile "$objdir/$subdir/mi-$testfile"
+standard_testfile watch-nonstop.c
 
 if {[gdb_compile "$srcdir/$subdir/$srcfile" $binfile executable {debug}] != "" } {
     return -1

diff --git a/gdb/testsuite/gdb.mi/mi-watch.exp b/gdb/testsuite/gdb.mi/mi-watch.exp
index 1fb2cc22394b2160707360e08ba7a2c31c2ede92..5ccff514c5d35e9ab53f88c8c120e994d548b4a3 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi-watch.exp
+++ b/gdb/testsuite/gdb.mi/mi-watch.exp
@@ -33,9 +33,8 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile "basics"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/mi-watch
+standard_testfile basics.c
+
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
      untested mi-watch.exp
      return -1

diff --git a/gdb/testsuite/gdb.mi/mi2-amd64-entry-value.exp b/gdb/testsuite/gdb.mi/mi2-amd64-entry-value.exp
index 12786bb3e3193a6314b1b70521ea70d1af6842ad..e7f1208e00a5b6ac65ec90d5532804a66083f9c2 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi2-amd64-entry-value.exp
+++ b/gdb/testsuite/gdb.mi/mi2-amd64-entry-value.exp
@@ -21,8 +21,7 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile mi2-amd64-entry-value
-set srcfile ${testfile}.s
+standard_testfile .s
 set opts {}
 
 if [info exists COMPILE] {
@@ -35,7 +34,6 @@ if [info exists COMPILE] {
 }
 
 set executable ${testfile}
-set binfile ${objdir}/${subdir}/${executable}
 
 if [build_executable ${testfile}.exp ${executable} ${srcfile} $opts] {
     return -1

diff --git a/gdb/testsuite/gdb.mi/mi2-basics.exp b/gdb/testsuite/gdb.mi/mi2-basics.exp
index 67bba6e26712831d6d9467d273a8057a0bb0d625..3a54f99ea98aef6572e2bf2aca4fdac00cecfed8 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi2-basics.exp
+++ b/gdb/testsuite/gdb.mi/mi2-basics.exp
@@ -33,9 +33,8 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile "basics"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/mi2-basics
+standard_testfile basics.c
+
 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 14ad922c06d9e63bc522b625e32c36cb4ab6167f..e1375e2b08283fdabb1464818be06e934ee9c565 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi2-break.exp
+++ b/gdb/testsuite/gdb.mi/mi2-break.exp
@@ -33,9 +33,8 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile "basics"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/mi2-break
+standard_testfile basics.c
+
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
      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 3c7c6d514744b93d808152268621339021a2fcae..e84b1910e7227b1167c901f153d0e14f6c4ba4ce 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi2-cli.exp
+++ b/gdb/testsuite/gdb.mi/mi2-cli.exp
@@ -27,9 +27,8 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile "basics"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/mi2-cli
+standard_testfile basics.c
+
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
      untested mi2-cli.exp
      return -1

diff --git a/gdb/testsuite/gdb.mi/mi2-console.exp b/gdb/testsuite/gdb.mi/mi2-console.exp
index 17f342370d5116a8ffc11e79dce8f55d334fd00d..e1e180bdfe938261e748be9849d675cac7012aa0 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi2-console.exp
+++ b/gdb/testsuite/gdb.mi/mi2-console.exp
@@ -36,9 +36,8 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile "mi-console"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile mi-console.c
+
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
      untested mi2-console.exp
      return -1

diff --git a/gdb/testsuite/gdb.mi/mi2-disassemble.exp b/gdb/testsuite/gdb.mi/mi2-disassemble.exp
index 66796d16d65510b82a6600e90414661203b359c5..30e9129047ff879f4d06811a53f7f2ab706d5a5f 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi2-disassemble.exp
+++ b/gdb/testsuite/gdb.mi/mi2-disassemble.exp
@@ -28,9 +28,8 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile "basics"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/mi2-disassemble
+standard_testfile basics.c
+
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
      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 74287e0714bf41a390030d6e3ffbdbc953f280fd..cb82c73948768efc4f514ba31e841ca737036d78 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi2-eval.exp
+++ b/gdb/testsuite/gdb.mi/mi2-eval.exp
@@ -30,9 +30,8 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile "basics"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/mi2-eval
+standard_testfile basics.c
+
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
      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 eb9d6b97cdab5aeb5073b682ddb8a9ba8271b047..56ad708ca51a4c98d921ac951d8d845545109ff2 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi2-file.exp
+++ b/gdb/testsuite/gdb.mi/mi2-file.exp
@@ -32,9 +32,8 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile "basics"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/mi2-file
+standard_testfile basics.c
+
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
      untested mi2-file.exp
      return -1

diff --git a/gdb/testsuite/gdb.mi/mi2-pthreads.exp b/gdb/testsuite/gdb.mi/mi2-pthreads.exp
index 8acc7ced98737df85c67977317dd9c4cd4fd94d3..37f325e50b872434e7463925d860964801229302 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi2-pthreads.exp
+++ b/gdb/testsuite/gdb.mi/mi2-pthreads.exp
@@ -55,11 +55,9 @@ proc check_mi_thread_command_set {} {
 #
 # Start here
 #
-set testfile "pthreads"
-set srcfile "$testfile.c"
-set binfile "$objdir/$subdir/mi2-$testfile"
+standard_testfile pthreads.c
 
-set options [list debug incdir=$objdir]
+set options [list debug]
 if {[gdb_compile_pthreads "$srcdir/$subdir/$srcfile" $binfile executable $options] != "" } {
     return -1
 }

diff --git a/gdb/testsuite/gdb.mi/mi2-read-memory.exp b/gdb/testsuite/gdb.mi/mi2-read-memory.exp
index 61a0efdbe82aa026d9a0d4d95b3402f13a217221..17c957389a5875506c27507f1135d56076a9b0bd 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi2-read-memory.exp
+++ b/gdb/testsuite/gdb.mi/mi2-read-memory.exp
@@ -33,9 +33,8 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile "mi-read-memory"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile mi-read-memory.c
+
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
      untested mi2-read-memory.exp
      return -1

diff --git a/gdb/testsuite/gdb.mi/mi2-regs.exp b/gdb/testsuite/gdb.mi/mi2-regs.exp
index 808c850246ce0072e638044b8d436bc3d57ed281..8ddf89465af1bdee8ac30173d8126d4e3cb6762c 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi2-regs.exp
+++ b/gdb/testsuite/gdb.mi/mi2-regs.exp
@@ -30,9 +30,8 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile "basics"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/mi2-regs
+standard_testfile basics.c
+
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
      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 d2b4836ed40db7d245891c032b04b8faa4d3fbdc..8d32e139c1beeedf897d1c08f0996aa750b03cdf 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi2-return.exp
+++ b/gdb/testsuite/gdb.mi/mi2-return.exp
@@ -30,9 +30,8 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile "basics"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/mi2-return
+standard_testfile basics.c
+
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
      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 c1cdc2fa31ce790e36ef6f5337d905f61d690bc4..d4bbdab4ba9df9f7c1b4250fa1028346e0454fde 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi2-simplerun.exp
+++ b/gdb/testsuite/gdb.mi/mi2-simplerun.exp
@@ -32,9 +32,8 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile "basics"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/mi2-simplerun
+standard_testfile basics.c
+
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
      untested mi2-simplerun.exp
      return -1

diff --git a/gdb/testsuite/gdb.mi/mi2-stack.exp b/gdb/testsuite/gdb.mi/mi2-stack.exp
index 0d7c961e8bfd27ffa756466da20ab252699577f6..9b79f418139a31ed14a2d448ce93427303d455fa 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi2-stack.exp
+++ b/gdb/testsuite/gdb.mi/mi2-stack.exp
@@ -30,9 +30,8 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile "mi-stack"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile mi-stack.c
+
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
      untested mi2-stack.exp
      return -1

diff --git a/gdb/testsuite/gdb.mi/mi2-stepi.exp b/gdb/testsuite/gdb.mi/mi2-stepi.exp
index ee096215e462d949cea8bd621768ad06c5139a8a..d2cbb0b0ad615fa1d9912cff80b5d2a0d250f116 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi2-stepi.exp
+++ b/gdb/testsuite/gdb.mi/mi2-stepi.exp
@@ -30,9 +30,8 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile "basics"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/mi2-stepi
+standard_testfile basics.c
+
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
      untested mi2-stepi.exp
      return -1

diff --git a/gdb/testsuite/gdb.mi/mi2-syn-frame.exp b/gdb/testsuite/gdb.mi/mi2-syn-frame.exp
index ea9aa7894857ca07a7f87fcfff1cdd154d27bac7..9c24cca4f1230d40099f80a54dd383f8cb9a0d16 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi2-syn-frame.exp
+++ b/gdb/testsuite/gdb.mi/mi2-syn-frame.exp
@@ -24,9 +24,8 @@ if [target_info exists gdb,nosignals] {
 load_lib mi-support.exp
 set MIFLAGS "-i=mi2"
 
-set testfile "mi-syn-frame"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile mi-syn-frame.c
+
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
      untested mi2-syn-frame.exp
      return -1

diff --git a/gdb/testsuite/gdb.mi/mi2-until.exp b/gdb/testsuite/gdb.mi/mi2-until.exp
index eff56aa5af7dec4b24d8fffe2ff1d786f9feed79..e1abc4afe2f47a020914a4b9cf2d6b0531c3f89c 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi2-until.exp
+++ b/gdb/testsuite/gdb.mi/mi2-until.exp
@@ -31,9 +31,8 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile "until"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile until.c
+
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
      untested mi2-until.exp
      return -1

diff --git a/gdb/testsuite/gdb.mi/mi2-var-block.exp b/gdb/testsuite/gdb.mi/mi2-var-block.exp
index 3eed5356c31f87bc4754d74ab36012d7088bd200..6999db682569b4d90766940edb100c51cecf16f9 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi2-var-block.exp
+++ b/gdb/testsuite/gdb.mi/mi2-var-block.exp
@@ -27,9 +27,8 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile "var-cmd"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/mi2-var-block
+standard_testfile var-cmd.c
+
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
     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 1497fd7c4cad6c6a74fd667bbd6c8e4960dcb3d5..fdf12f7598b766ee240bdd883b6709ad26292f46 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi2-var-child.exp
+++ b/gdb/testsuite/gdb.mi/mi2-var-child.exp
@@ -27,9 +27,8 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile "var-cmd"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/mi2-var-child
+standard_testfile var-cmd.c
+
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
     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 96d328a0cf4fc068d889b511619a255c2432e620..5af2af83e77dd59cb52146b7590615c037045a25 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi2-var-cmd.exp
+++ b/gdb/testsuite/gdb.mi/mi2-var-cmd.exp
@@ -27,9 +27,8 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile "var-cmd"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/mi2-var-cmd
+standard_testfile var-cmd.c
+
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
     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 d3b97a5b3b0a9123814e83189973c827d2b016d4..4bb1cd89963f1edf2dc2c6cbb333a93cf268d636 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi2-var-display.exp
+++ b/gdb/testsuite/gdb.mi/mi2-var-display.exp
@@ -27,9 +27,8 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile "var-cmd"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/mi2-var-display
+standard_testfile var-cmd.c
+
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
     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 5c72eb49dd72d6e02446142227aa6076cac289bb..5a56c8e7cc2d7b32ecf52159529d5938d12c8e65 100644 (file)
--- a/gdb/testsuite/gdb.mi/mi2-watch.exp
+++ b/gdb/testsuite/gdb.mi/mi2-watch.exp
@@ -32,9 +32,8 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile "basics"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/mi2-watch
+standard_testfile basics.c
+
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
      untested mi2-watch.exp
      return -1