From b0963d73503e461769479e7fa2e106d27fe77c05 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 25 Jun 2012 19:46:26 +0000 Subject: [PATCH] * gdb.server/ext-attach.exp: Use standard_testfile, prepare_for_testing. * gdb.server/ext-run.exp: Use standard_testfile, build_executable. * gdb.server/file-transfer.exp: Use standard_testfile, prepare_for_testing. * gdb.server/server-exec-info.exp: Use standard_testfile. * gdb.server/server-mon.exp: Use standard_testfile, prepare_for_testing. * gdb.server/server-run.exp: Use standard_testfile, build_executable. * gdb.server/solib-list.exp: Use standard_testfile, standard_output_file. --- gdb/testsuite/ChangeLog | 16 ++++++++++++++++ gdb/testsuite/gdb.server/ext-attach.exp | 12 ++---------- gdb/testsuite/gdb.server/ext-run.exp | 6 ++---- gdb/testsuite/gdb.server/file-transfer.exp | 12 ++---------- gdb/testsuite/gdb.server/server-exec-info.exp | 4 +--- gdb/testsuite/gdb.server/server-mon.exp | 11 ++--------- gdb/testsuite/gdb.server/server-run.exp | 6 ++---- gdb/testsuite/gdb.server/solib-list.exp | 8 +++----- 8 files changed, 30 insertions(+), 45 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 7c4fe35bac3..9c8aab867c3 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,19 @@ +2012-06-25 Tom Tromey + + * gdb.server/ext-attach.exp: Use standard_testfile, + prepare_for_testing. + * gdb.server/ext-run.exp: Use standard_testfile, + build_executable. + * gdb.server/file-transfer.exp: Use standard_testfile, + prepare_for_testing. + * gdb.server/server-exec-info.exp: Use standard_testfile. + * gdb.server/server-mon.exp: Use standard_testfile, + prepare_for_testing. + * gdb.server/server-run.exp: Use standard_testfile, + build_executable. + * gdb.server/solib-list.exp: Use standard_testfile, + standard_output_file. + 2012-06-25 Tom Tromey * lib/gdb.exp (standard_output_file): Use "file join". diff --git a/gdb/testsuite/gdb.server/ext-attach.exp b/gdb/testsuite/gdb.server/ext-attach.exp index 8cfcaaf4f77..c5aec84d201 100644 --- a/gdb/testsuite/gdb.server/ext-attach.exp +++ b/gdb/testsuite/gdb.server/ext-attach.exp @@ -19,9 +19,7 @@ load_lib gdbserver-support.exp -set testfile "ext-attach" -set srcfile ${testfile}.c -set binfile ${objdir}/${subdir}/${testfile} +standard_testfile if { [skip_gdbserver_tests] } { return 0 @@ -32,16 +30,10 @@ if [is_remote target] then { return 0 } -if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - untested ext-attach.exp +if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { return -1 } -gdb_exit -gdb_start -gdb_load $binfile -gdb_reinitialize_dir $srcdir/$subdir - # Make sure we're disconnected, in case we're testing with an # extended-remote board, therefore already connected. gdb_test "disconnect" ".*" diff --git a/gdb/testsuite/gdb.server/ext-run.exp b/gdb/testsuite/gdb.server/ext-run.exp index 53938ca41ef..f397cd925c6 100644 --- a/gdb/testsuite/gdb.server/ext-run.exp +++ b/gdb/testsuite/gdb.server/ext-run.exp @@ -19,15 +19,13 @@ load_lib gdbserver-support.exp -set testfile "server" -set srcfile ${testfile}.c -set binfile ${objdir}/${subdir}/ext-run +standard_testfile server.c if { [skip_gdbserver_tests] } { return 0 } -if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { +if {[build_executable $testfile.exp $testfile $srcfile debug] == -1} { return -1 } diff --git a/gdb/testsuite/gdb.server/file-transfer.exp b/gdb/testsuite/gdb.server/file-transfer.exp index 12e8f26a7bc..c5455efc095 100644 --- a/gdb/testsuite/gdb.server/file-transfer.exp +++ b/gdb/testsuite/gdb.server/file-transfer.exp @@ -18,24 +18,16 @@ load_lib gdbserver-support.exp -set testfile "server" -set srcfile ${testfile}.c -set binfile ${objdir}/${subdir}/file-transfer${EXEEXT} +standard_testfile server.c if { [skip_gdbserver_tests] } { return 0 } -if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { - untested file-transfer.exp +if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { return -1 } -gdb_exit -gdb_start -gdb_load $binfile -gdb_reinitialize_dir $srcdir/$subdir - # Make sure we're disconnected, in case we're testing with an # extended-remote board, therefore already connected. gdb_test "disconnect" ".*" diff --git a/gdb/testsuite/gdb.server/server-exec-info.exp b/gdb/testsuite/gdb.server/server-exec-info.exp index 3d773afc7d8..00775f1f8bf 100644 --- a/gdb/testsuite/gdb.server/server-exec-info.exp +++ b/gdb/testsuite/gdb.server/server-exec-info.exp @@ -15,9 +15,7 @@ load_lib gdbserver-support.exp -set testfile "no-execfile-info" -set srcfile "server.c" -#if { [build_executable ${testfile}.exp ${testfile} ${srcfile}] == -1} { +standard_testfile server.c if [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile}] { return -1 } diff --git a/gdb/testsuite/gdb.server/server-mon.exp b/gdb/testsuite/gdb.server/server-mon.exp index ca9ee3ed69a..f47fe155cd2 100644 --- a/gdb/testsuite/gdb.server/server-mon.exp +++ b/gdb/testsuite/gdb.server/server-mon.exp @@ -19,23 +19,16 @@ load_lib gdbserver-support.exp -set testfile "server" -set srcfile ${testfile}.c -set binfile ${objdir}/${subdir}/server-mon +standard_testfile server.c if { [skip_gdbserver_tests] } { return 0 } -if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { +if {[prepare_for_testing $testfile.exp $testfile $srcfile debug]} { return -1 } -gdb_exit -gdb_start -gdb_load $binfile -gdb_reinitialize_dir $srcdir/$subdir - # Make sure we're disconnected, in case we're testing with an # extended-remote board, therefore already connected. gdb_test "disconnect" ".*" diff --git a/gdb/testsuite/gdb.server/server-run.exp b/gdb/testsuite/gdb.server/server-run.exp index 88031e7aa35..da357b4a21e 100644 --- a/gdb/testsuite/gdb.server/server-run.exp +++ b/gdb/testsuite/gdb.server/server-run.exp @@ -19,15 +19,13 @@ load_lib gdbserver-support.exp -set testfile "server" -set srcfile ${testfile}.c -set binfile ${objdir}/${subdir}/server-run +standard_testfile server.c if { [skip_gdbserver_tests] } { return 0 } -if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { +if {[build_executable $testfile.exp $testfile $srcfile debug] == -1} { return -1 } diff --git a/gdb/testsuite/gdb.server/solib-list.exp b/gdb/testsuite/gdb.server/solib-list.exp index ee68382db19..fc540068415 100644 --- a/gdb/testsuite/gdb.server/solib-list.exp +++ b/gdb/testsuite/gdb.server/solib-list.exp @@ -27,13 +27,11 @@ if {[skip_gdbserver_tests] || [skip_shlib_tests]} { return } -set testfile "solib-list" +standard_testfile solib-list-main.c set srclibfile ${testfile}-lib.c -set srcfile ${testfile}-main.c -set binlibfile ${objdir}/${subdir}/${testfile}.so +set binlibfile [standard_output_file ${testfile}.so] set executable ${testfile} -set objfile ${objdir}/${subdir}/${executable}.o -set binfile ${objdir}/${subdir}/${executable} +set objfile ${binfile}.o if { [get_compiler_info] || [gdb_compile_shlib "${srcdir}/${subdir}/${srclibfile}" "${binlibfile}" [list debug ldflags=-Wl,-soname,${binlibfile}]] != "" -- 2.30.2