* gdb.python/lib-types.exp: Use standard_testfile,

prepare_for_testing.
	* gdb.python/py-block.exp: Use standard_testfile.
	* gdb.python/py-breakpoint.exp: Use standard_testfile.
	* gdb.python/py-events.exp: Use standard_testfile,
	standard_output_file.
	* gdb.python/py-evsignal.exp: Use standard_testfile.
	* gdb.python/py-evethreads.exp: Use standard_testfile.
	* gdb.python/py-explore-cc.exp: Use standard_testfile.
	* gdb.python/py-explore.exp: Use standard_testfile.
	* gdb.python/py-finish-breakpoint.exp: Use standard_testfile,
	standard_output_file.
	* gdb.python/py-finish-breakpoint2.exp: Use standard_testfile,
	prepare_for_testing.
	* gdb.python/py-frame-inline.exp: Use standard_testfile.
	* gdb.python/py-frame.exp: Use standard_testfile.
	* gdb.python/py-inferior.exp: Use standard_testfile.
	* gdb.python/py-infthread.exp: Use standard_testfile.
	* gdb.python/py-mi.exp: Use standard_testfile.
	* gdb.python/py-objfile-script.exp: Use standard_testfile,
	build_executable.
	* gdb.python/py-objfile.exp: Use standard_testfile.
	* gdb.python/py-pp-maint.exp: Use standard_testfile,
	prepare_for_testing.
	* gdb.python/py-prettyprint.exp: Use standard_testfile.
	* gdb.python/py-progspace.exp: Use standard_testfile,
	build_executable.
	* gdb.python/py-prompt.exp: Use standard_testfile,
	build_executable.
	* gdb.python/py-section-script.exp: Use standard_testfile,
	build_executable.
	* gdb.python/py-shared.exp: Use standard_testfile,
	standard_output_file, clean_restart.
	* gdb.python/py-symbol.exp: Use standard_output_file,
	prepare_for_testing.
	* gdb.python/py-symtab.exp: Use standard_output_file,
	prepare_for_testing
	* gdb.python/py-template.exp: Use standard_testfile.
	* gdb.python/py-type.exp: Use standard_testfile.
	* gdb.python/py-value-cc.exp: Use standard_testfile.
	* gdb.python/py-value.exp: Use standard_testfile.
	* gdb.python/python.exp: Use standard_testfile, build_executable.

gdb/testsuite/ChangeLog

@@ -1,3 +1,48 @@
+2012-06-22  Tom Tromey  <tromey@redhat.com>
+
+	* gdb.python/lib-types.exp: Use standard_testfile,
+	prepare_for_testing.
+	* gdb.python/py-block.exp: Use standard_testfile.
+	* gdb.python/py-breakpoint.exp: Use standard_testfile.
+	* gdb.python/py-events.exp: Use standard_testfile,
+	standard_output_file.
+	* gdb.python/py-evsignal.exp: Use standard_testfile.
+	* gdb.python/py-evethreads.exp: Use standard_testfile.
+	* gdb.python/py-explore-cc.exp: Use standard_testfile.
+	* gdb.python/py-explore.exp: Use standard_testfile.
+	* gdb.python/py-finish-breakpoint.exp: Use standard_testfile,
+	standard_output_file.
+	* gdb.python/py-finish-breakpoint2.exp: Use standard_testfile,
+	prepare_for_testing.
+	* gdb.python/py-frame-inline.exp: Use standard_testfile.
+	* gdb.python/py-frame.exp: Use standard_testfile.
+	* gdb.python/py-inferior.exp: Use standard_testfile.
+	* gdb.python/py-infthread.exp: Use standard_testfile.
+	* gdb.python/py-mi.exp: Use standard_testfile.
+	* gdb.python/py-objfile-script.exp: Use standard_testfile,
+	build_executable.
+	* gdb.python/py-objfile.exp: Use standard_testfile.
+	* gdb.python/py-pp-maint.exp: Use standard_testfile,
+	prepare_for_testing.
+	* gdb.python/py-prettyprint.exp: Use standard_testfile.
+	* gdb.python/py-progspace.exp: Use standard_testfile,
+	build_executable.
+	* gdb.python/py-prompt.exp: Use standard_testfile,
+	build_executable.
+	* gdb.python/py-section-script.exp: Use standard_testfile,
+	build_executable.
+	* gdb.python/py-shared.exp: Use standard_testfile,
+	standard_output_file, clean_restart.
+	* gdb.python/py-symbol.exp: Use standard_output_file,
+	prepare_for_testing.
+	* gdb.python/py-symtab.exp: Use standard_output_file,
+	prepare_for_testing
+	* gdb.python/py-template.exp: Use standard_testfile.
+	* gdb.python/py-type.exp: Use standard_testfile.
+	* gdb.python/py-value-cc.exp: Use standard_testfile.
+	* gdb.python/py-value.exp: Use standard_testfile.
+	* gdb.python/python.exp: Use standard_testfile, build_executable.
+
 2012-06-22  Tom Tromey  <tromey@redhat.com>
 
 	* gdb.objc/basicclass.exp: Use standard_testfile.

gdb/testsuite/gdb.python/lib-types.exp

@@ -18,20 +18,12 @@
 
 load_lib gdb-python.exp
 
-set testfile "lib-types"
+standard_testfile .cc
-set srcfile ${testfile}.cc
+
-set binfile ${objdir}/${subdir}/${testfile}
+if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} {
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
-    untested "Couldn't compile ${srcfile}"
     return -1
 }
 
-# Start with a fresh gdb.
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
 # Skip all tests if Python scripting is not enabled.
 if { [skip_python_tests] } { continue }
 

gdb/testsuite/gdb.python/py-block.exp

@@ -18,8 +18,8 @@
 
 load_lib gdb-python.exp
 
-set testfile "py-block"
+standard_testfile
-set srcfile ${testfile}.c
+
 if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } {
     return -1
 }

gdb/testsuite/gdb.python/py-breakpoint.exp

@@ -18,8 +18,8 @@
 
 load_lib gdb-python.exp
 
-set testfile "py-breakpoint"
+standard_testfile
-set srcfile ${testfile}.c
+
 if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } {
     return -1
 }

gdb/testsuite/gdb.python/py-events.exp

@@ -21,12 +21,10 @@ load_lib gdb-python.exp
 
 set libfile "py-events-shlib"
 set libsrc  $srcdir/$subdir/$libfile.c
-set lib_sl  $objdir/$subdir/$libfile.so
+set lib_sl  [standard_output_file $libfile.so]
 set lib_opts  debug
 
-set testfile "py-events"
+standard_testfile
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
 set exec_opts [list debug shlib=$lib_sl]
 set pyfile ${srcdir}/${subdir}/${testfile}.py
 

gdb/testsuite/gdb.python/py-evsignal.exp

@@ -21,9 +21,7 @@ if {[is_remote target]} {
 
 load_lib gdb-python.exp
 
-set testfile "py-evsignal"
+standard_testfile py-evthreads.c
-set srcfile py-evthreads.c
-set binfile ${objdir}/${subdir}/${testfile}
 set pyfile ${srcdir}/${subdir}/py-events.py
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {

gdb/testsuite/gdb.python/py-evthreads.exp

@@ -26,9 +26,7 @@ if { ![support_displaced_stepping] } {
 
 load_lib gdb-python.exp
 
-set testfile "py-evthreads"
+standard_testfile
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
 set pyfile ${srcdir}/${subdir}/py-events.py
 
 if {[gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {

gdb/testsuite/gdb.python/py-explore-cc.exp

@@ -18,9 +18,7 @@
 
 if { [skip_cplus_tests] } { continue }
 
-set testfile "py-explore"
+standard_testfile py-explore.cc
-set srcfile ${testfile}.cc
-set binfile ${objdir}/${subdir}/${testfile}
 
 if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} {
     return -1

gdb/testsuite/gdb.python/py-explore.exp

@@ -13,9 +13,8 @@
 # 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 "py-explore"
+standard_testfile
-set srcfile ${testfile}.c
+
-set binfile ${objdir}/${subdir}/${testfile}
 if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } {
     return -1
 }

gdb/testsuite/gdb.python/py-finish-breakpoint.exp

@@ -25,12 +25,10 @@ load_lib gdb-python.exp
 
 set libfile "py-events-shlib"
 set libsrc  $srcdir/$subdir/$libfile.c
-set lib_sl  $objdir/$subdir/$libfile-nodebug.so
+set lib_sl  [standard_output_file $libfile-nodebug.so]
 set lib_opts ""
 
-set testfile "py-finish-breakpoint"
+standard_testfile
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
 set exec_opts [list debug shlib=$lib_sl]
 
 if [get_compiler_info] {

gdb/testsuite/gdb.python/py-finish-breakpoint2.exp

@@ -18,22 +18,13 @@
 
 load_lib gdb-python.exp
 
-set testfile "py-finish-breakpoint2"
+standard_testfile .cc
-set srcfile ${testfile}.cc
-set binfile ${objdir}/${subdir}/${testfile}
 set pyfile  ${srcdir}/${subdir}/${testfile}.py
 
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } {
+if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} {
-    untested "Couldn't compile ${srcfile}"
     return -1
 }
 
-# Start with a fresh gdb.
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
 # Skip all tests if Python scripting is not enabled.
 if { [skip_python_tests] } { continue }
 

gdb/testsuite/gdb.python/py-frame-inline.exp

@@ -15,8 +15,8 @@
 
 load_lib gdb-python.exp
 
-set testfile "py-frame-inline"
+standard_testfile
-set srcfile ${testfile}.c
+
 if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } {
     return -1
 }

gdb/testsuite/gdb.python/py-frame.exp

@@ -18,8 +18,8 @@
 
 load_lib gdb-python.exp
 
-set testfile "py-frame"
+standard_testfile
-set srcfile ${testfile}.c
+
 if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } {
     return -1
 }

gdb/testsuite/gdb.python/py-inferior.exp

@@ -18,8 +18,8 @@
 
 load_lib gdb-python.exp
 
-set testfile "py-inferior"
+standard_testfile
-set srcfile ${testfile}.c
+
 if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } {
     return -1
 }
@@ -216,4 +216,4 @@ gdb_test "add-inferior" "Added inferior 3" "Create new inferior"
 gdb_test "inferior 3" ".*" "Switch to third inferior"
 gdb_test "py print gdb.selected_inferior().num" "3" "Third inferior selected"
 gdb_test "inferior 1" ".*" "Switch to first inferior"
-gdb_test_no_output "remove-inferiors 3" "Remove second inferior"
+gdb_test_no_output "remove-inferiors 3" "Remove second inferior"

gdb/testsuite/gdb.python/py-infthread.exp

@@ -18,8 +18,8 @@
 
 load_lib gdb-python.exp
 
-set testfile "py-infthread"
+standard_testfile
-set srcfile ${testfile}.c
+
 if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } {
     return -1
 }

gdb/testsuite/gdb.python/py-mi.exp

@@ -24,9 +24,7 @@ if [mi_gdb_start] {
     continue
 }
 
-set testfile "py-mi"
+standard_testfile py-prettyprint.c
-set srcfile py-prettyprint.c
-set binfile ${objdir}/${subdir}/${testfile}
 set pyfile py-prettyprint.py
 if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DMI}] != "" } {
     untested ${testfile}.exp

gdb/testsuite/gdb.python/py-objfile-script.exp

@@ -16,11 +16,9 @@
 # This file is part of the GDB testsuite.  It tests automagic loading of
 # -gdb.py scripts.
 
-set testfile "py-objfile-script"
+standard_testfile
-set srcfile ${testfile}.c
+
-set binfile ${objdir}/${subdir}/${testfile}
+if {[build_executable $testfile.exp $testfile $srcfile debug] == -1} {
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "Couldn't compile ${srcfile}"
     return -1
 }
 

gdb/testsuite/gdb.python/py-objfile.exp

@@ -18,8 +18,7 @@
 
 load_lib gdb-python.exp
 
-set testfile "py-objfile"
+standard_testfile
-set srcfile ${testfile}.c
 
 if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] } {
     return -1

gdb/testsuite/gdb.python/py-pp-maint.exp

@@ -23,24 +23,14 @@ if [is_remote host] {
 
 load_lib gdb-python.exp
 
-set testfile "py-pp-maint"
+standard_testfile
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
 
-# Start with a fresh gdb.
+if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} {
-gdb_exit
-gdb_start
-
-# Skip all tests if Python scripting is not enabled.
-if { [skip_python_tests] } { continue }
-
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable "debug"] != "" } {
-    untested "Couldn't compile ${srcfile}"
     return -1
 }
 
-gdb_reinitialize_dir $srcdir/$subdir
+# Skip all tests if Python scripting is not enabled.
-gdb_load ${binfile}
+if { [skip_python_tests] } { continue }
 
 if ![runto_main ] then {
     fail "Can't run to main"

gdb/testsuite/gdb.python/py-prettyprint.exp

@@ -18,9 +18,7 @@
 
 load_lib gdb-python.exp
 
-set testfile "py-prettyprint"
+standard_testfile
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
 
 # Start with a fresh gdb.
 gdb_exit

gdb/testsuite/gdb.python/py-progspace.exp

@@ -16,11 +16,9 @@
 # This file is part of the GDB testsuite.  It tests the program space
 # support in Python.
 
-set testfile "py-progspace"
+standard_testfile
-set srcfile ${testfile}.c
+
-set binfile ${objdir}/${subdir}/${testfile}
+if {[build_executable $testfile.exp $testfile $srcfile debug] == -1} {
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "Couldn't compile ${srcfile}"
     return -1
 }
 

gdb/testsuite/gdb.python/py-prompt.exp

@@ -16,9 +16,7 @@
 # This file is part of the GDB testsuite.  It tests the mechanism
 # for defining the prompt in Python.
 
-set testfile "py-prompt"
+standard_testfile
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
 
 # We need to use TCL's exec to get the pid.
 if [is_remote target] then {
@@ -38,8 +36,7 @@ gdb_reinitialize_dir $srcdir/$subdir
 if { [skip_python_tests] } { continue }
 gdb_exit
 
-if  { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
+if {[build_executable $testfile.exp $testfile $srcfile debug] == -1} {
-    untested py-prompt.exp
     return -1
 }
 

gdb/testsuite/gdb.python/py-section-script.exp

@@ -29,11 +29,9 @@ if {![istarget *-*-linux*]
     return
 }
 
-set testfile "py-section-script"
+standard_testfile
-set srcfile ${testfile}.c
+
-set binfile ${objdir}/${subdir}/${testfile}
+if {[build_executable $testfile.exp $testfile $srcfile debug] == -1} {
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "Couldn't compile ${srcfile}"
     return -1
 }
 

gdb/testsuite/gdb.python/py-shared.exp

@@ -21,12 +21,11 @@ if {[skip_shlib_tests]} {
     return 0
 }
 
-set testfile "py-shared"
+standard_testfile
-set srcfile  ${testfile}.c
+
 set libfile  "py-shared-sl"
 set libsrc   ${libfile}.c
-set library  ${objdir}/${subdir}/${libfile}.sl
+set library  [standard_output_file ${libfile}.sl]
-set binfile  ${objdir}/${subdir}/${testfile}
 
 if { [gdb_compile_shlib ${srcdir}/${subdir}/${libsrc} ${library} "debug"] != "" } {
     untested "Could not compile shared library."
@@ -41,10 +40,7 @@ if { [gdb_compile ${srcdir}/${subdir}/${srcfile} ${binfile} executable $exec_opt
 }
 
 # Start with a fresh gdb.
-gdb_exit
+clean_restart $testfile
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
 gdb_load_shlibs ${library}
 
 # Skip all tests if Python scripting is not enabled.

gdb/testsuite/gdb.python/py-symbol.exp

@@ -18,20 +18,12 @@
 
 load_lib gdb-python.exp
 
-set testfile "py-symbol"
+standard_testfile
-set srcfile ${testfile}.c
+
-set binfile ${objdir}/${subdir}/${testfile}
+if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} {
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "Couldn't compile ${srcfile}"
     return -1
 }
 
-# Start with a fresh gdb.
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
 # Skip all tests if Python scripting is not enabled.
 if { [skip_python_tests] } { continue }
 

gdb/testsuite/gdb.python/py-symtab.exp

@@ -18,20 +18,12 @@
 
 load_lib gdb-python.exp
 
-set testfile "py-symbol"
+standard_testfile py-symbol.c
-set srcfile ${testfile}.c
+
-set binfile ${objdir}/${subdir}/${testfile}
+if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} {
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
-    untested "Couldn't compile ${srcfile}"
     return -1
 }
 
-# Start with a fresh gdb.
-gdb_exit
-gdb_start
-gdb_reinitialize_dir $srcdir/$subdir
-gdb_load ${binfile}
-
 # Skip all tests if Python scripting is not enabled.
 if { [skip_python_tests] } { continue }
 

gdb/testsuite/gdb.python/py-template.exp

@@ -18,9 +18,7 @@
 
 if { [skip_cplus_tests] } { continue }
 
-set testfile "py-template"
+standard_testfile .cc
-set srcfile ${testfile}.cc
-set binfile ${objdir}/${subdir}/${testfile}
 if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable \
 	  {debug c++}] != "" } {
     untested "Couldn't compile ${srcfile}"

gdb/testsuite/gdb.python/py-type.exp

@@ -18,9 +18,7 @@
 
 load_lib gdb-python.exp
 
-set testfile "py-type"
+standard_testfile
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
 
 if [get_compiler_info c++] {
     return -1;

gdb/testsuite/gdb.python/py-value-cc.exp

@@ -18,9 +18,7 @@
 
 if { [skip_cplus_tests] } { continue }
 
-set testfile "py-value"
+standard_testfile py-value.cc
-set srcfile ${testfile}.cc
-set binfile ${objdir}/${subdir}/${testfile}
 
 if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} {
     return -1

gdb/testsuite/gdb.python/py-value.exp

@@ -18,9 +18,7 @@
 
 load_lib gdb-python.exp
 
-set testfile "py-value"
+standard_testfile
-set srcfile ${testfile}.c
-set binfile ${objdir}/${subdir}/${testfile}
 
 # Build inferior to language specification.
 proc build_inferior {exefile lang} {

gdb/testsuite/gdb.python/python.exp

@@ -18,14 +18,10 @@
 
 load_lib gdb-python.exp
 
-set testfile "python"
+standard_testfile python.c python-1.c
-set srcfile  ${testfile}.c
-set srcfile1  ${testfile}-1.c
-set binfile  ${objdir}/${subdir}/${testfile}
 
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile} ${srcdir}/${subdir}/${srcfile1}" \
+if {[build_executable $testfile.exp $testfile \
-	  ${binfile} executable {debug}] != "" } {
+	 [list $srcfile $srcfile2] debug] == -1} {
-    untested "Could not compile $binfile."
     return -1
 }