* gdb.multi/watchpoint-multi.exp: Use standard_testfile.

* gdb.multi/bkpt-multi-exec.exp: Use standard_output_file.  Use
	build_executable, not prepare_for_testing.
	* gdb.multi/base.exp: Use standard_output_file.  Use
	build_executable,  not prepare_for_testing.
This commit is contained in:
Tom Tromey 2012-06-25 21:07:32 +00:00
parent cf09b3e42c
commit 7bb18ae2ad
4 changed files with 20 additions and 15 deletions

View File

@ -1,3 +1,11 @@
2012-06-25 Tom Tromey <tromey@redhat.com>
* gdb.multi/watchpoint-multi.exp: Use standard_testfile.
* gdb.multi/bkpt-multi-exec.exp: Use standard_output_file. Use
build_executable, not prepare_for_testing.
* gdb.multi/base.exp: Use standard_output_file. Use
build_executable, not prepare_for_testing.
2012-06-25 Tom Tromey <tromey@redhat.com>
* gdb.fortran/subarray.exp: Use standard_testfile,

View File

@ -20,25 +20,25 @@ set testfile "base"
set exec1 "hello"
set srcfile1 ${exec1}.c
set binfile1 ${objdir}/${subdir}/${exec1}
set binfile1 [standard_output_file ${exec1}]
set exec2 "hangout"
set srcfile2 ${exec2}.c
set binfile2 ${objdir}/${subdir}/${exec2}
set binfile2 [standard_output_file ${exec2}]
set exec3 "goodbye"
set srcfile3 ${exec3}.c
set binfile3 ${objdir}/${subdir}/${exec3}
set binfile3 [standard_output_file ${exec3}]
if { [prepare_for_testing ${testfile}.exp ${exec1} "${srcfile1}" {debug nowarnings}] } {
if { [build_executable ${testfile}.exp ${exec1} "${srcfile1}" {debug nowarnings}] == -1 } {
return -1
}
if { [prepare_for_testing ${testfile}.exp ${exec2} "${srcfile2}" {debug nowarnings}] } {
if { [build_executable ${testfile}.exp ${exec2} "${srcfile2}" {debug nowarnings}] == -1} {
return -1
}
if { [prepare_for_testing ${testfile}.exp ${exec3} "${srcfile3}" {debug nowarnings}] } {
if { [build_executable ${testfile}.exp ${exec3} "${srcfile3}" {debug nowarnings}] == -1 } {
return -1
}

View File

@ -27,17 +27,17 @@ set testfile "bkpt-multi-exec"
set exec1 "bkpt-multi-exec"
set srcfile1 ${exec1}.c
set binfile1 ${objdir}/${subdir}/${exec1}
set binfile1 [standard_output_file ${exec1}]
set exec2 "crashme"
set srcfile2 ${exec2}.c
set binfile2 ${objdir}/${subdir}/${exec2}
set binfile2 [standard_output_file ${exec2}]
if { [prepare_for_testing ${testfile}.exp ${exec1} "${srcfile1}" {debug nowarnings}] } {
if { [build_executable ${testfile}.exp ${exec1} "${srcfile1}" {debug nowarnings}] == -1 } {
return -1
}
if { [prepare_for_testing ${testfile}.exp ${exec2} "${srcfile2}" {debug nowarnings}] } {
if { [build_executable ${testfile}.exp ${exec2} "${srcfile2}" {debug nowarnings}] == -1 } {
return -1
}

View File

@ -13,7 +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 "watchpoint-multi"
standard_testfile
set executable ${testfile}
# Multiple inferiors are needed, therefore both native and extended gdbserver
# modes are supported. Only non-extended gdbserver is not supported.
@ -29,10 +30,6 @@ if [skip_hw_watchpoint_access_tests] {
return
}
set executable ${testfile}
set srcfile ${testfile}.c
set binfile ${objdir}/${subdir}/${executable}
if { [gdb_compile_pthreads "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
untested ${testfile}.exp
return -1