This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
FYI: clean up gdb.mi
- From: Tom Tromey <tromey at redhat dot com>
- To: gdb-patches at sourceware dot org
- Date: Tue, 10 Jul 2012 09:32:24 -0600
- Subject: FYI: clean up gdb.mi
I'm checking this in.
This fixes up gdb.mi to use standard_testfile and standard_output_file.
There are still a few uses of $objdir left in gdb.mi. I'm still
considering what to do about those.
This fixes a few latent parallelization bugs. For example, from
gdb2549.exp:
-set testfile "basics"
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
... this was using the wrong name for the executable.
It clashed with at least mi-logging.exp:
-set testfile basics
-set srcfile "$testfile.c"
-set executable ${testfile}
-set binfile $objdir/$subdir/$testfile
Regtested on x86-64 Fedora 16.
Tom
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.
Index: gdb.mi/dw2-ref-missing-frame.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/dw2-ref-missing-frame.exp,v
retrieving revision 1.4
diff -u -r1.4 dw2-ref-missing-frame.exp
--- gdb.mi/dw2-ref-missing-frame.exp 4 Jan 2012 08:17:54 -0000 1.4
+++ gdb.mi/dw2-ref-missing-frame.exp 10 Jul 2012 15:30:05 -0000
@@ -22,19 +22,14 @@
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}
-
-if { [gdb_compile "${srcdir}/${subdir}/${srcsfile}" $objsfile object {}] != ""
- || [gdb_compile "${srcdir}/${subdir}/${srcfuncfile}" $objfuncfile object {}] != ""
- || [gdb_compile "${srcdir}/${subdir}/${srcmainfile}" $objmainfile object {debug}] != ""
+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}/${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
}
Index: gdb.mi/gdb2549.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/gdb2549.exp,v
retrieving revision 1.7
diff -u -r1.7 gdb2549.exp
--- gdb.mi/gdb2549.exp 9 Jul 2012 18:28:17 -0000 1.7
+++ gdb.mi/gdb2549.exp 10 Jul 2012 15:30:05 -0000
@@ -30,9 +30,8 @@
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
Index: gdb.mi/gdb669.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/gdb669.exp,v
retrieving revision 1.16
diff -u -r1.16 gdb669.exp
--- gdb.mi/gdb669.exp 4 Jan 2012 08:17:54 -0000 1.16
+++ gdb.mi/gdb669.exp 10 Jul 2012 15:30:05 -0000
@@ -28,11 +28,9 @@
#
# 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
}
Index: gdb.mi/gdb701.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/gdb701.exp,v
retrieving revision 1.14
diff -u -r1.14 gdb701.exp
--- gdb.mi/gdb701.exp 4 Jan 2012 08:17:54 -0000 1.14
+++ gdb.mi/gdb701.exp 10 Jul 2012 15:30:05 -0000
@@ -25,9 +25,8 @@
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
Index: gdb.mi/gdb792.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/gdb792.exp,v
retrieving revision 1.16
diff -u -r1.16 gdb792.exp
--- gdb.mi/gdb792.exp 21 Jun 2012 20:46:24 -0000 1.16
+++ gdb.mi/gdb792.exp 10 Jul 2012 15:30:05 -0000
@@ -27,9 +27,7 @@
continue
}
-set testfile gdb792
-set srcfile "$testfile.cc"
-set binfile $objdir/$subdir/$testfile
+standard_testfile .cc
if [get_compiler_info "c++"] {
return -1;
Index: gdb.mi/mi-async.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-async.exp,v
retrieving revision 1.14
diff -u -r1.14 mi-async.exp
--- gdb.mi/mi-async.exp 9 Jul 2012 18:28:17 -0000 1.14
+++ gdb.mi/mi-async.exp 10 Jul 2012 15:30:05 -0000
@@ -36,9 +36,8 @@
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
Index: gdb.mi/mi-basics.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-basics.exp,v
retrieving revision 1.29
diff -u -r1.29 mi-basics.exp
--- gdb.mi/mi-basics.exp 9 Jul 2012 18:28:17 -0000 1.29
+++ gdb.mi/mi-basics.exp 10 Jul 2012 15:30:05 -0000
@@ -33,9 +33,7 @@
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}]
Index: gdb.mi/mi-break.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-break.exp,v
retrieving revision 1.35
diff -u -r1.35 mi-break.exp
--- gdb.mi/mi-break.exp 9 Jul 2012 18:28:17 -0000 1.35
+++ gdb.mi/mi-break.exp 10 Jul 2012 15:30:05 -0000
@@ -32,9 +32,8 @@
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
Index: gdb.mi/mi-cli.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-cli.exp,v
retrieving revision 1.27
diff -u -r1.27 mi-cli.exp
--- gdb.mi/mi-cli.exp 9 Jul 2012 18:28:17 -0000 1.27
+++ gdb.mi/mi-cli.exp 10 Jul 2012 15:30:05 -0000
@@ -27,9 +27,8 @@
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
Index: gdb.mi/mi-console.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-console.exp,v
retrieving revision 1.29
diff -u -r1.29 mi-console.exp
--- gdb.mi/mi-console.exp 9 Jul 2012 18:28:17 -0000 1.29
+++ gdb.mi/mi-console.exp 10 Jul 2012 15:30:05 -0000
@@ -36,9 +36,8 @@
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
Index: gdb.mi/mi-disassemble.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-disassemble.exp,v
retrieving revision 1.28
diff -u -r1.28 mi-disassemble.exp
--- gdb.mi/mi-disassemble.exp 9 Jul 2012 18:28:17 -0000 1.28
+++ gdb.mi/mi-disassemble.exp 10 Jul 2012 15:30:05 -0000
@@ -29,9 +29,8 @@
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
Index: gdb.mi/mi-eval.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-eval.exp,v
retrieving revision 1.19
diff -u -r1.19 mi-eval.exp
--- gdb.mi/mi-eval.exp 9 Jul 2012 18:28:17 -0000 1.19
+++ gdb.mi/mi-eval.exp 10 Jul 2012 15:30:05 -0000
@@ -30,9 +30,8 @@
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
Index: gdb.mi/mi-file-transfer.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-file-transfer.exp,v
retrieving revision 1.7
diff -u -r1.7 mi-file-transfer.exp
--- gdb.mi/mi-file-transfer.exp 4 Jan 2012 08:17:54 -0000 1.7
+++ gdb.mi/mi-file-transfer.exp 10 Jul 2012 15:30:05 -0000
@@ -24,9 +24,8 @@
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
Index: gdb.mi/mi-file.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-file.exp,v
retrieving revision 1.18
diff -u -r1.18 mi-file.exp
--- gdb.mi/mi-file.exp 9 Jul 2012 18:28:17 -0000 1.18
+++ gdb.mi/mi-file.exp 10 Jul 2012 15:30:05 -0000
@@ -32,9 +32,8 @@
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
Index: gdb.mi/mi-inheritance-syntax-error.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-inheritance-syntax-error.exp,v
retrieving revision 1.5
diff -u -r1.5 mi-inheritance-syntax-error.exp
--- gdb.mi/mi-inheritance-syntax-error.exp 21 Jun 2012 20:46:24 -0000 1.5
+++ gdb.mi/mi-inheritance-syntax-error.exp 10 Jul 2012 15:30:05 -0000
@@ -23,9 +23,7 @@
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;
Index: gdb.mi/mi-logging.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-logging.exp,v
retrieving revision 1.1
diff -u -r1.1 mi-logging.exp
--- gdb.mi/mi-logging.exp 28 Jun 2012 22:11:23 -0000 1.1
+++ gdb.mi/mi-logging.exp 10 Jul 2012 15:30:05 -0000
@@ -21,13 +21,10 @@
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;
}
Index: gdb.mi/mi-nonstop-exit.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-nonstop-exit.exp,v
retrieving revision 1.10
diff -u -r1.10 mi-nonstop-exit.exp
--- gdb.mi/mi-nonstop-exit.exp 4 Jan 2012 08:17:54 -0000 1.10
+++ gdb.mi/mi-nonstop-exit.exp 10 Jul 2012 15:30:05 -0000
@@ -29,11 +29,9 @@
#
# 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
}
Index: gdb.mi/mi-nonstop.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-nonstop.exp,v
retrieving revision 1.19
diff -u -r1.19 mi-nonstop.exp
--- gdb.mi/mi-nonstop.exp 4 Jan 2012 08:17:54 -0000 1.19
+++ gdb.mi/mi-nonstop.exp 10 Jul 2012 15:30:05 -0000
@@ -39,11 +39,9 @@
#
# 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
}
Index: gdb.mi/mi-ns-stale-regcache.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-ns-stale-regcache.exp,v
retrieving revision 1.8
diff -u -r1.8 mi-ns-stale-regcache.exp
--- gdb.mi/mi-ns-stale-regcache.exp 4 Jan 2012 08:17:54 -0000 1.8
+++ gdb.mi/mi-ns-stale-regcache.exp 10 Jul 2012 15:30:05 -0000
@@ -41,11 +41,9 @@
#
# 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
Index: gdb.mi/mi-nsintrall.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-nsintrall.exp,v
retrieving revision 1.14
diff -u -r1.14 mi-nsintrall.exp
--- gdb.mi/mi-nsintrall.exp 4 Jan 2012 08:17:54 -0000 1.14
+++ gdb.mi/mi-nsintrall.exp 10 Jul 2012 15:30:05 -0000
@@ -29,11 +29,9 @@
#
# 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
}
Index: gdb.mi/mi-nsmoribund.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-nsmoribund.exp,v
retrieving revision 1.16
diff -u -r1.16 mi-nsmoribund.exp
--- gdb.mi/mi-nsmoribund.exp 4 Jan 2012 08:17:54 -0000 1.16
+++ gdb.mi/mi-nsmoribund.exp 10 Jul 2012 15:30:05 -0000
@@ -29,11 +29,9 @@
#
# 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
}
Index: gdb.mi/mi-nsthrexec.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-nsthrexec.exp,v
retrieving revision 1.9
diff -u -r1.9 mi-nsthrexec.exp
--- gdb.mi/mi-nsthrexec.exp 4 Jan 2012 08:17:54 -0000 1.9
+++ gdb.mi/mi-nsthrexec.exp 10 Jul 2012 15:30:05 -0000
@@ -39,11 +39,9 @@
#
# 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
}
Index: gdb.mi/mi-pending.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-pending.exp,v
retrieving revision 1.15
diff -u -r1.15 mi-pending.exp
--- gdb.mi/mi-pending.exp 21 Jun 2012 20:46:24 -0000 1.15
+++ gdb.mi/mi-pending.exp 10 Jul 2012 15:30:05 -0000
@@ -24,12 +24,8 @@
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 @@
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
Index: gdb.mi/mi-pthreads.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-pthreads.exp,v
retrieving revision 1.20
diff -u -r1.20 mi-pthreads.exp
--- gdb.mi/mi-pthreads.exp 4 Jan 2012 08:17:54 -0000 1.20
+++ gdb.mi/mi-pthreads.exp 10 Jul 2012 15:30:05 -0000
@@ -61,11 +61,9 @@
#
# 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
}
Index: gdb.mi/mi-read-memory.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-read-memory.exp,v
retrieving revision 1.19
diff -u -r1.19 mi-read-memory.exp
--- gdb.mi/mi-read-memory.exp 9 Jul 2012 18:28:17 -0000 1.19
+++ gdb.mi/mi-read-memory.exp 10 Jul 2012 15:30:05 -0000
@@ -33,9 +33,8 @@
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
Index: gdb.mi/mi-regs.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-regs.exp,v
retrieving revision 1.26
diff -u -r1.26 mi-regs.exp
--- gdb.mi/mi-regs.exp 9 Jul 2012 18:28:17 -0000 1.26
+++ gdb.mi/mi-regs.exp 10 Jul 2012 15:30:05 -0000
@@ -30,9 +30,8 @@
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
Index: gdb.mi/mi-return.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-return.exp,v
retrieving revision 1.25
diff -u -r1.25 mi-return.exp
--- gdb.mi/mi-return.exp 9 Jul 2012 18:28:17 -0000 1.25
+++ gdb.mi/mi-return.exp 10 Jul 2012 15:30:05 -0000
@@ -31,9 +31,8 @@
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
Index: gdb.mi/mi-reverse.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-reverse.exp,v
retrieving revision 1.7
diff -u -r1.7 mi-reverse.exp
--- gdb.mi/mi-reverse.exp 9 Jul 2012 18:28:17 -0000 1.7
+++ gdb.mi/mi-reverse.exp 10 Jul 2012 15:30:05 -0000
@@ -39,9 +39,8 @@
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
Index: gdb.mi/mi-simplerun.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-simplerun.exp,v
retrieving revision 1.28
diff -u -r1.28 mi-simplerun.exp
--- gdb.mi/mi-simplerun.exp 9 Jul 2012 18:28:17 -0000 1.28
+++ gdb.mi/mi-simplerun.exp 10 Jul 2012 15:30:05 -0000
@@ -32,9 +32,8 @@
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
Index: gdb.mi/mi-solib.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-solib.exp,v
retrieving revision 1.5
diff -u -r1.5 mi-solib.exp
--- gdb.mi/mi-solib.exp 21 Jun 2012 20:46:24 -0000 1.5
+++ gdb.mi/mi-solib.exp 10 Jul 2012 15:30:05 -0000
@@ -26,14 +26,14 @@
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 { [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
}
Index: gdb.mi/mi-stack.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-stack.exp,v
retrieving revision 1.34
diff -u -r1.34 mi-stack.exp
--- gdb.mi/mi-stack.exp 9 Jul 2012 18:28:17 -0000 1.34
+++ gdb.mi/mi-stack.exp 10 Jul 2012 15:30:05 -0000
@@ -31,9 +31,8 @@
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
Index: gdb.mi/mi-stepi.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-stepi.exp,v
retrieving revision 1.23
diff -u -r1.23 mi-stepi.exp
--- gdb.mi/mi-stepi.exp 9 Jul 2012 18:28:17 -0000 1.23
+++ gdb.mi/mi-stepi.exp 10 Jul 2012 15:30:05 -0000
@@ -31,9 +31,8 @@
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
Index: gdb.mi/mi-stepn.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-stepn.exp,v
retrieving revision 1.1
diff -u -r1.1 mi-stepn.exp
--- gdb.mi/mi-stepn.exp 5 Jan 2012 13:11:30 -0000 1.1
+++ gdb.mi/mi-stepn.exp 10 Jul 2012 15:30:05 -0000
@@ -24,13 +24,10 @@
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
}
Index: gdb.mi/mi-syn-frame.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-syn-frame.exp,v
retrieving revision 1.27
diff -u -r1.27 mi-syn-frame.exp
--- gdb.mi/mi-syn-frame.exp 9 Jul 2012 18:28:17 -0000 1.27
+++ gdb.mi/mi-syn-frame.exp 10 Jul 2012 15:30:05 -0000
@@ -24,9 +24,8 @@
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
Index: gdb.mi/mi-until.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-until.exp,v
retrieving revision 1.24
diff -u -r1.24 mi-until.exp
--- gdb.mi/mi-until.exp 9 Jul 2012 18:28:17 -0000 1.24
+++ gdb.mi/mi-until.exp 10 Jul 2012 15:30:05 -0000
@@ -30,9 +30,8 @@
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
Index: gdb.mi/mi-var-block.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-var-block.exp,v
retrieving revision 1.27
diff -u -r1.27 mi-var-block.exp
--- gdb.mi/mi-var-block.exp 9 Jul 2012 18:28:17 -0000 1.27
+++ gdb.mi/mi-var-block.exp 10 Jul 2012 15:30:05 -0000
@@ -27,9 +27,8 @@
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
Index: gdb.mi/mi-var-child-f.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-var-child-f.exp,v
retrieving revision 1.13
diff -u -r1.13 mi-var-child-f.exp
--- gdb.mi/mi-var-child-f.exp 4 Jan 2012 08:17:54 -0000 1.13
+++ gdb.mi/mi-var-child-f.exp 10 Jul 2012 15:30:05 -0000
@@ -25,9 +25,8 @@
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
Index: gdb.mi/mi-var-child.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-var-child.exp,v
retrieving revision 1.39
diff -u -r1.39 mi-var-child.exp
--- gdb.mi/mi-var-child.exp 9 Jul 2012 18:28:17 -0000 1.39
+++ gdb.mi/mi-var-child.exp 10 Jul 2012 15:30:05 -0000
@@ -28,9 +28,8 @@
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
Index: gdb.mi/mi-var-cmd.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-var-cmd.exp,v
retrieving revision 1.52
diff -u -r1.52 mi-var-cmd.exp
--- gdb.mi/mi-var-cmd.exp 9 Jul 2012 18:28:17 -0000 1.52
+++ gdb.mi/mi-var-cmd.exp 10 Jul 2012 15:30:05 -0000
@@ -28,9 +28,8 @@
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
Index: gdb.mi/mi-var-cp.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-var-cp.exp,v
retrieving revision 1.15
diff -u -r1.15 mi-var-cp.exp
--- gdb.mi/mi-var-cp.exp 21 Jun 2012 20:46:24 -0000 1.15
+++ gdb.mi/mi-var-cp.exp 10 Jul 2012 15:30:05 -0000
@@ -23,9 +23,7 @@
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;
Index: gdb.mi/mi-var-display.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-var-display.exp,v
retrieving revision 1.42
diff -u -r1.42 mi-var-display.exp
--- gdb.mi/mi-var-display.exp 9 Jul 2012 18:28:17 -0000 1.42
+++ gdb.mi/mi-var-display.exp 10 Jul 2012 15:30:06 -0000
@@ -27,9 +27,8 @@
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
Index: gdb.mi/mi-var-invalidate.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-var-invalidate.exp,v
retrieving revision 1.11
diff -u -r1.11 mi-var-invalidate.exp
--- gdb.mi/mi-var-invalidate.exp 9 Jul 2012 18:28:17 -0000 1.11
+++ gdb.mi/mi-var-invalidate.exp 10 Jul 2012 15:30:06 -0000
@@ -28,15 +28,14 @@
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 @@
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
Index: gdb.mi/mi-var-rtti.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-var-rtti.exp,v
retrieving revision 1.1
diff -u -r1.1 mi-var-rtti.exp
--- gdb.mi/mi-var-rtti.exp 14 Apr 2012 12:18:41 -0000 1.1
+++ gdb.mi/mi-var-rtti.exp 10 Jul 2012 15:30:06 -0000
@@ -23,13 +23,10 @@
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;
}
Index: gdb.mi/mi-watch-nonstop.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-watch-nonstop.exp,v
retrieving revision 1.2
diff -u -r1.2 mi-watch-nonstop.exp
--- gdb.mi/mi-watch-nonstop.exp 4 Jan 2012 08:17:54 -0000 1.2
+++ gdb.mi/mi-watch-nonstop.exp 10 Jul 2012 15:30:06 -0000
@@ -42,9 +42,7 @@
#
# 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
Index: gdb.mi/mi-watch.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi-watch.exp,v
retrieving revision 1.31
diff -u -r1.31 mi-watch.exp
--- gdb.mi/mi-watch.exp 9 Jul 2012 18:28:17 -0000 1.31
+++ gdb.mi/mi-watch.exp 10 Jul 2012 15:30:06 -0000
@@ -33,9 +33,8 @@
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
Index: gdb.mi/mi2-amd64-entry-value.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi2-amd64-entry-value.exp,v
retrieving revision 1.2
diff -u -r1.2 mi2-amd64-entry-value.exp
--- gdb.mi/mi2-amd64-entry-value.exp 4 Jan 2012 08:17:54 -0000 1.2
+++ gdb.mi/mi2-amd64-entry-value.exp 10 Jul 2012 15:30:06 -0000
@@ -21,8 +21,7 @@
continue
}
-set testfile mi2-amd64-entry-value
-set srcfile ${testfile}.s
+standard_testfile .s
set opts {}
if [info exists COMPILE] {
@@ -35,7 +34,6 @@
}
set executable ${testfile}
-set binfile ${objdir}/${subdir}/${executable}
if [build_executable ${testfile}.exp ${executable} ${srcfile} $opts] {
return -1
Index: gdb.mi/mi2-basics.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi2-basics.exp,v
retrieving revision 1.21
diff -u -r1.21 mi2-basics.exp
--- gdb.mi/mi2-basics.exp 9 Jul 2012 18:28:17 -0000 1.21
+++ gdb.mi/mi2-basics.exp 10 Jul 2012 15:30:06 -0000
@@ -33,9 +33,8 @@
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}]
Index: gdb.mi/mi2-break.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi2-break.exp,v
retrieving revision 1.17
diff -u -r1.17 mi2-break.exp
--- gdb.mi/mi2-break.exp 9 Jul 2012 18:28:17 -0000 1.17
+++ gdb.mi/mi2-break.exp 10 Jul 2012 15:30:06 -0000
@@ -33,9 +33,8 @@
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
Index: gdb.mi/mi2-cli.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi2-cli.exp,v
retrieving revision 1.22
diff -u -r1.22 mi2-cli.exp
--- gdb.mi/mi2-cli.exp 9 Jul 2012 18:28:17 -0000 1.22
+++ gdb.mi/mi2-cli.exp 10 Jul 2012 15:30:06 -0000
@@ -27,9 +27,8 @@
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
Index: gdb.mi/mi2-console.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi2-console.exp,v
retrieving revision 1.19
diff -u -r1.19 mi2-console.exp
--- gdb.mi/mi2-console.exp 9 Jul 2012 18:28:17 -0000 1.19
+++ gdb.mi/mi2-console.exp 10 Jul 2012 15:30:06 -0000
@@ -36,9 +36,8 @@
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
Index: gdb.mi/mi2-disassemble.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi2-disassemble.exp,v
retrieving revision 1.18
diff -u -r1.18 mi2-disassemble.exp
--- gdb.mi/mi2-disassemble.exp 9 Jul 2012 18:28:17 -0000 1.18
+++ gdb.mi/mi2-disassemble.exp 10 Jul 2012 15:30:06 -0000
@@ -28,9 +28,8 @@
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
Index: gdb.mi/mi2-eval.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi2-eval.exp,v
retrieving revision 1.13
diff -u -r1.13 mi2-eval.exp
--- gdb.mi/mi2-eval.exp 9 Jul 2012 18:28:17 -0000 1.13
+++ gdb.mi/mi2-eval.exp 10 Jul 2012 15:30:06 -0000
@@ -30,9 +30,8 @@
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
Index: gdb.mi/mi2-file.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi2-file.exp,v
retrieving revision 1.18
diff -u -r1.18 mi2-file.exp
--- gdb.mi/mi2-file.exp 9 Jul 2012 18:28:17 -0000 1.18
+++ gdb.mi/mi2-file.exp 10 Jul 2012 15:30:06 -0000
@@ -32,9 +32,8 @@
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
Index: gdb.mi/mi2-pthreads.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi2-pthreads.exp,v
retrieving revision 1.14
diff -u -r1.14 mi2-pthreads.exp
--- gdb.mi/mi2-pthreads.exp 4 Jan 2012 08:17:54 -0000 1.14
+++ gdb.mi/mi2-pthreads.exp 10 Jul 2012 15:30:06 -0000
@@ -55,11 +55,9 @@
#
# 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
}
Index: gdb.mi/mi2-read-memory.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi2-read-memory.exp,v
retrieving revision 1.12
diff -u -r1.12 mi2-read-memory.exp
--- gdb.mi/mi2-read-memory.exp 9 Jul 2012 18:28:17 -0000 1.12
+++ gdb.mi/mi2-read-memory.exp 10 Jul 2012 15:30:06 -0000
@@ -33,9 +33,8 @@
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
Index: gdb.mi/mi2-regs.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi2-regs.exp,v
retrieving revision 1.16
diff -u -r1.16 mi2-regs.exp
--- gdb.mi/mi2-regs.exp 9 Jul 2012 18:28:17 -0000 1.16
+++ gdb.mi/mi2-regs.exp 10 Jul 2012 15:30:06 -0000
@@ -30,9 +30,8 @@
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
Index: gdb.mi/mi2-return.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi2-return.exp,v
retrieving revision 1.17
diff -u -r1.17 mi2-return.exp
--- gdb.mi/mi2-return.exp 9 Jul 2012 18:28:17 -0000 1.17
+++ gdb.mi/mi2-return.exp 10 Jul 2012 15:30:06 -0000
@@ -30,9 +30,8 @@
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
Index: gdb.mi/mi2-simplerun.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi2-simplerun.exp,v
retrieving revision 1.19
diff -u -r1.19 mi2-simplerun.exp
--- gdb.mi/mi2-simplerun.exp 9 Jul 2012 18:28:17 -0000 1.19
+++ gdb.mi/mi2-simplerun.exp 10 Jul 2012 15:30:06 -0000
@@ -32,9 +32,8 @@
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
Index: gdb.mi/mi2-stack.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi2-stack.exp,v
retrieving revision 1.19
diff -u -r1.19 mi2-stack.exp
--- gdb.mi/mi2-stack.exp 9 Jul 2012 18:28:17 -0000 1.19
+++ gdb.mi/mi2-stack.exp 10 Jul 2012 15:30:06 -0000
@@ -30,9 +30,8 @@
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
Index: gdb.mi/mi2-stepi.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi2-stepi.exp,v
retrieving revision 1.16
diff -u -r1.16 mi2-stepi.exp
--- gdb.mi/mi2-stepi.exp 9 Jul 2012 18:28:17 -0000 1.16
+++ gdb.mi/mi2-stepi.exp 10 Jul 2012 15:30:06 -0000
@@ -30,9 +30,8 @@
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
Index: gdb.mi/mi2-syn-frame.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi2-syn-frame.exp,v
retrieving revision 1.23
diff -u -r1.23 mi2-syn-frame.exp
--- gdb.mi/mi2-syn-frame.exp 9 Jul 2012 18:28:17 -0000 1.23
+++ gdb.mi/mi2-syn-frame.exp 10 Jul 2012 15:30:06 -0000
@@ -24,9 +24,8 @@
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
Index: gdb.mi/mi2-until.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi2-until.exp,v
retrieving revision 1.18
diff -u -r1.18 mi2-until.exp
--- gdb.mi/mi2-until.exp 9 Jul 2012 18:28:17 -0000 1.18
+++ gdb.mi/mi2-until.exp 10 Jul 2012 15:30:06 -0000
@@ -31,9 +31,8 @@
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
Index: gdb.mi/mi2-var-block.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi2-var-block.exp,v
retrieving revision 1.19
diff -u -r1.19 mi2-var-block.exp
--- gdb.mi/mi2-var-block.exp 9 Jul 2012 18:28:17 -0000 1.19
+++ gdb.mi/mi2-var-block.exp 10 Jul 2012 15:30:06 -0000
@@ -27,9 +27,8 @@
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
Index: gdb.mi/mi2-var-child.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi2-var-child.exp,v
retrieving revision 1.19
diff -u -r1.19 mi2-var-child.exp
--- gdb.mi/mi2-var-child.exp 9 Jul 2012 18:28:17 -0000 1.19
+++ gdb.mi/mi2-var-child.exp 10 Jul 2012 15:30:06 -0000
@@ -27,9 +27,8 @@
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
Index: gdb.mi/mi2-var-cmd.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi2-var-cmd.exp,v
retrieving revision 1.30
diff -u -r1.30 mi2-var-cmd.exp
--- gdb.mi/mi2-var-cmd.exp 9 Jul 2012 18:28:17 -0000 1.30
+++ gdb.mi/mi2-var-cmd.exp 10 Jul 2012 15:30:06 -0000
@@ -27,9 +27,8 @@
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
Index: gdb.mi/mi2-var-display.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi2-var-display.exp,v
retrieving revision 1.34
diff -u -r1.34 mi2-var-display.exp
--- gdb.mi/mi2-var-display.exp 9 Jul 2012 18:28:17 -0000 1.34
+++ gdb.mi/mi2-var-display.exp 10 Jul 2012 15:30:06 -0000
@@ -27,9 +27,8 @@
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
Index: gdb.mi/mi2-watch.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.mi/mi2-watch.exp,v
retrieving revision 1.22
diff -u -r1.22 mi2-watch.exp
--- gdb.mi/mi2-watch.exp 9 Jul 2012 18:28:17 -0000 1.22
+++ gdb.mi/mi2-watch.exp 10 Jul 2012 15:30:06 -0000
@@ -32,9 +32,8 @@
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