* gdb.opt/clobbered-registers-O2.exp: Use standard_testfile,

	prepare_for_testing.
	* gdb.opt/inline-break.exp: Use standard_testfile,
	prepare_for_testing.
	* gdb.opt/inline-bt.exp: Use standard_testfile,
	prepare_for_testing.
	* gdb.opt/inline-cmds.exp: Use standard_testfile,
	prepare_for_testing.
	* gdb.opt/inline-locals.exp: Use standard_testfile,
	prepare_for_testing.

6 files changed, 34 insertions, 67 deletions

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 8fc997138b4..0f59fac5427 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,18 @@
 2012-06-25  Tom Tromey  <tromey@redhat.com>
 
+	* gdb.opt/clobbered-registers-O2.exp: Use standard_testfile,
+	prepare_for_testing.
+	* gdb.opt/inline-break.exp: Use standard_testfile,
+	prepare_for_testing.
+	* gdb.opt/inline-bt.exp: Use standard_testfile,
+	prepare_for_testing.
+	* gdb.opt/inline-cmds.exp: Use standard_testfile,
+	prepare_for_testing.
+	* gdb.opt/inline-locals.exp: Use standard_testfile,
+	prepare_for_testing.
+
+2012-06-25  Tom Tromey  <tromey@redhat.com>
+
 	* gdb.asm/asm-source.exp: Use standard_output_file,
 	standard_testfile.  Construct .o files in proper subdir.
 
diff --git a/gdb/testsuite/gdb.opt/clobbered-registers-O2.exp b/gdb/testsuite/gdb.opt/clobbered-registers-O2.exp
index 0c319800518..a733baa0d18 100644
--- a/gdb/testsuite/gdb.opt/clobbered-registers-O2.exp
+++ b/gdb/testsuite/gdb.opt/clobbered-registers-O2.exp
@@ -18,9 +18,7 @@
 # Test displaying call clobbered registers in optimized binaries.
 # GDB should not show incorrect values.
 
-set testfile clobbered-registers-O2
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
+standard_testfile
 
 # What compiler are we using?
 #
@@ -28,19 +26,11 @@ if [get_compiler_info] {
     return -1
 }
 
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [concat debug optimize=-O2 nowarnings]] != "" } {
-     untested clobbered-registers-O2.exp
-     return -1
+if {[prepare_for_testing $testfile.exp $testfile $srcfile \
+	 {debug optimize=-O2 nowarnings}]} {
+    return -1
 }
 
-# use this to debug:
-#log_user 1
-
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
 if { ![runto start_sequence] } then {
    fail "run to start_sequence"
    return
diff --git a/gdb/testsuite/gdb.opt/inline-break.exp b/gdb/testsuite/gdb.opt/inline-break.exp
index c3577235085..2a7ef39d67b 100644
--- a/gdb/testsuite/gdb.opt/inline-break.exp
+++ b/gdb/testsuite/gdb.opt/inline-break.exp
@@ -17,10 +17,9 @@
 # mirrors this testcase, and should be updated if this testcase is
 # changed.
 
-set basename "inline-break"
-set testfile $basename
+standard_testfile
 
-if { [prepare_for_testing $testfile.exp $testfile $testfile.c \
+if { [prepare_for_testing $testfile.exp $testfile $srcfile \
           {debug optimize=-O2 additional_flags=-Winline}] } {
     return -1
 }
@@ -30,7 +29,7 @@ if { [prepare_for_testing $testfile.exp $testfile $testfile.c \
 # The result should be a single-location breakpoint.
 #
 gdb_test "break func1" \
-    "Breakpoint.*at.* file .*$basename\\.c, line.*"
+    "Breakpoint.*at.* file .*$srcfile, line.*"
 
 #
 # func2 is a non-static inlined function that is called once.
@@ -46,7 +45,7 @@ gdb_test "break func2" \
 # a single-location breakpoint.
 #
 gdb_test "break func3b" \
-    "Breakpoint.*at.* file .*$basename\\.c, line.*"
+    "Breakpoint.*at.* file .*$srcfile, line.*"
 
 #
 # func4b is a static inlined function that is called once from
diff --git a/gdb/testsuite/gdb.opt/inline-bt.exp b/gdb/testsuite/gdb.opt/inline-bt.exp
index a90a1a7cc41..8eecd35872a 100644
--- a/gdb/testsuite/gdb.opt/inline-bt.exp
+++ b/gdb/testsuite/gdb.opt/inline-bt.exp
@@ -13,25 +13,14 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-set testfile "inline-bt"
-set srcfile ${testfile}.c
-set srcfile2 "inline-markers.c"
-set fullsrcfile "${srcdir}/${subdir}/${srcfile}"
-set fullsrcfile2 "${srcdir}/${subdir}/${srcfile2}"
-set sources [list ${fullsrcfile} ${fullsrcfile2}]
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile ${sources} ${binfile} \
-	   executable {debug optimize=-O2 additional_flags=-Winline}] != "" } {
-    untested inline-bt.exp
+standard_testfile .c inline-markers.c
+
+if {[prepare_for_testing $testfile.exp $testfile \
+	 [list $srcfile $srcfile2] \
+	 {debug optimize=-O2 additional_flags=-Winline}]} {
     return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
 runto_main
 
 get_compiler_info
diff --git a/gdb/testsuite/gdb.opt/inline-cmds.exp b/gdb/testsuite/gdb.opt/inline-cmds.exp
index ec38d39c4b4..2a333e0be37 100644
--- a/gdb/testsuite/gdb.opt/inline-cmds.exp
+++ b/gdb/testsuite/gdb.opt/inline-cmds.exp
@@ -13,25 +13,13 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-set testfile "inline-cmds"
-set srcfile "${testfile}.c"
-set srcfile2 "inline-markers.c"
-set fullsrcfile "${srcdir}/${subdir}/${srcfile}"
-set fullsrcfile2 "${srcdir}/${subdir}/${srcfile2}"
-set sources [list ${fullsrcfile} ${fullsrcfile2}]
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile $sources ${binfile} \
-	   executable {debug optimize=-O2}] != "" } {
-    untested inline-cmds.exp
+standard_testfile .c inline-markers.c
+
+if {[prepare_for_testing $testfile.exp $testfile \
+	 [list $srcfile $srcfile2] {debug optimize=-O2}]} {
     return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
 gdb_test_no_output "set listsize 1"
 
 runto_main
diff --git a/gdb/testsuite/gdb.opt/inline-locals.exp b/gdb/testsuite/gdb.opt/inline-locals.exp
index 4fbceb0caab..7ff6a13b9cf 100644
--- a/gdb/testsuite/gdb.opt/inline-locals.exp
+++ b/gdb/testsuite/gdb.opt/inline-locals.exp
@@ -13,25 +13,13 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-set testfile "inline-locals"
-set srcfile ${testfile}.c
-set srcfile2 "inline-markers.c"
-set fullsrcfile "${srcdir}/${subdir}/${srcfile}"
-set fullsrcfile2 "${srcdir}/${subdir}/${srcfile2}"
-set sources [list ${fullsrcfile} ${fullsrcfile2}]
-set binfile ${objdir}/${subdir}/${testfile}
-
-if  { [gdb_compile ${sources} ${binfile} \
-	   executable {debug optimize=-O2}] != "" } {
-    untested inline-locals.exp
+standard_testfile .c inline-markers.c
+
+if {[prepare_for_testing $testfile.exp $testfile \
+	 [list $srcfile $srcfile2] {debug optimize=-O2}]} {
     return -1
 }
 
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
 runto_main
 
 get_compiler_info