diff options
| -rw-r--r-- | gdb/testsuite/ChangeLog | 8 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.multi/base.exp | 12 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.multi/bkpt-multi-exec.exp | 8 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.multi/watchpoint-multi.exp | 7 |
4 files changed, 20 insertions, 15 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 44637aa..86c351c 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,13 @@ 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, prepare_for_testing. * gdb.fortran/multi-dim.exp: Use standard_testfile. diff --git a/gdb/testsuite/gdb.multi/base.exp b/gdb/testsuite/gdb.multi/base.exp index 70cbc46..172eb41 100644 --- a/gdb/testsuite/gdb.multi/base.exp +++ b/gdb/testsuite/gdb.multi/base.exp @@ -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 } diff --git a/gdb/testsuite/gdb.multi/bkpt-multi-exec.exp b/gdb/testsuite/gdb.multi/bkpt-multi-exec.exp index 3893a79..6a76d07 100644 --- a/gdb/testsuite/gdb.multi/bkpt-multi-exec.exp +++ b/gdb/testsuite/gdb.multi/bkpt-multi-exec.exp @@ -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 } diff --git a/gdb/testsuite/gdb.multi/watchpoint-multi.exp b/gdb/testsuite/gdb.multi/watchpoint-multi.exp index bb5675b..09d3f7c 100644 --- a/gdb/testsuite/gdb.multi/watchpoint-multi.exp +++ b/gdb/testsuite/gdb.multi/watchpoint-multi.exp @@ -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 |