This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
FYI: fix up gdb.server
- From: Tom Tromey <tromey at redhat dot com>
- To: gdb-patches at sourceware dot org
- Date: Mon, 25 Jun 2012 13:46:01 -0600
- Subject: FYI: fix up gdb.server
I'm checking this in.
Continuing my audit of the test suite; this patch converts gdb.server to
use standard_* and also uses prepare_for_testing or build_executable
as appropriate.
Regtested on x86-64 Fedora 16.
Tom
2012-06-25 Tom Tromey <tromey@redhat.com>
* 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.
Index: gdb.server/ext-attach.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.server/ext-attach.exp,v
retrieving revision 1.12
diff -u -r1.12 ext-attach.exp
--- gdb.server/ext-attach.exp 15 Feb 2012 12:51:17 -0000 1.12
+++ gdb.server/ext-attach.exp 25 Jun 2012 19:37:45 -0000
@@ -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 @@
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" ".*"
Index: gdb.server/ext-run.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.server/ext-run.exp,v
retrieving revision 1.17
diff -u -r1.17 ext-run.exp
--- gdb.server/ext-run.exp 15 Feb 2012 12:51:17 -0000 1.17
+++ gdb.server/ext-run.exp 25 Jun 2012 19:37:45 -0000
@@ -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
}
Index: gdb.server/file-transfer.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.server/file-transfer.exp,v
retrieving revision 1.9
diff -u -r1.9 file-transfer.exp
--- gdb.server/file-transfer.exp 15 Feb 2012 12:51:17 -0000 1.9
+++ gdb.server/file-transfer.exp 25 Jun 2012 19:37:45 -0000
@@ -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" ".*"
Index: gdb.server/server-exec-info.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.server/server-exec-info.exp,v
retrieving revision 1.1
diff -u -r1.1 server-exec-info.exp
--- gdb.server/server-exec-info.exp 12 Feb 2012 19:15:01 -0000 1.1
+++ gdb.server/server-exec-info.exp 25 Jun 2012 19:37:45 -0000
@@ -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
}
Index: gdb.server/server-mon.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.server/server-mon.exp,v
retrieving revision 1.11
diff -u -r1.11 server-mon.exp
--- gdb.server/server-mon.exp 15 Feb 2012 12:51:17 -0000 1.11
+++ gdb.server/server-mon.exp 25 Jun 2012 19:37:45 -0000
@@ -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" ".*"
Index: gdb.server/server-run.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.server/server-run.exp,v
retrieving revision 1.12
diff -u -r1.12 server-run.exp
--- gdb.server/server-run.exp 15 Feb 2012 12:51:17 -0000 1.12
+++ gdb.server/server-run.exp 25 Jun 2012 19:37:45 -0000
@@ -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
}
Index: gdb.server/solib-list.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.server/solib-list.exp,v
retrieving revision 1.2
diff -u -r1.2 solib-list.exp
--- gdb.server/solib-list.exp 21 Jun 2012 20:46:24 -0000 1.2
+++ gdb.server/solib-list.exp 25 Jun 2012 19:37:45 -0000
@@ -27,13 +27,11 @@
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}]] != ""