From 6496a6093db530ef4ab153eb510eeda17a7301c5 Mon Sep 17 00:00:00 2001 From: Doug Evans Date: Tue, 12 Jan 2010 00:50:26 +0000 Subject: [PATCH] * lib/gdbserver-support.exp (gdbserver_download_current_prog): Rename from gdbserver_download. All callers updated. --- gdb/testsuite/ChangeLog | 3 +++ gdb/testsuite/gdb.server/ext-attach.exp | 2 +- gdb/testsuite/gdb.server/ext-run.exp | 2 +- gdb/testsuite/lib/gdbserver-support.exp | 6 ++++-- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index b0fcac7c314..ae6fda9e601 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2010-01-11 Doug Evans + * lib/gdbserver-support.exp (gdbserver_download_current_prog): Rename + from gdbserver_download. All callers updated. + * gdb.server/ext-run.exp: "info os processes" requires xml support. 2010-01-11 Jan Kratochvil diff --git a/gdb/testsuite/gdb.server/ext-attach.exp b/gdb/testsuite/gdb.server/ext-attach.exp index a00075be5d9..196c56b7fd0 100644 --- a/gdb/testsuite/gdb.server/ext-attach.exp +++ b/gdb/testsuite/gdb.server/ext-attach.exp @@ -42,7 +42,7 @@ gdb_start gdb_load $binfile gdb_reinitialize_dir $srcdir/$subdir -set target_exec [gdbserver_download] +set target_exec [gdbserver_download_current_prog] gdbserver_start_extended gdb_test "set remote exec-file $target_exec" "" "set remote exec-file" diff --git a/gdb/testsuite/gdb.server/ext-run.exp b/gdb/testsuite/gdb.server/ext-run.exp index 5797c802381..9b140d6b66a 100644 --- a/gdb/testsuite/gdb.server/ext-run.exp +++ b/gdb/testsuite/gdb.server/ext-run.exp @@ -40,7 +40,7 @@ gdb_start gdb_load $binfile gdb_reinitialize_dir $srcdir/$subdir -set target_exec [gdbserver_download] +set target_exec [gdbserver_download_current_prog] gdbserver_start_extended gdb_test "set remote exec-file $target_exec" "" "set remote exec-file" diff --git a/gdb/testsuite/lib/gdbserver-support.exp b/gdb/testsuite/lib/gdbserver-support.exp index d4c5eb82d22..5d53dfa7bb3 100644 --- a/gdb/testsuite/lib/gdbserver-support.exp +++ b/gdb/testsuite/lib/gdbserver-support.exp @@ -139,8 +139,10 @@ proc skip_gdbserver_tests { } { # Download the currently loaded program to the target if necessary. # Return the target system filename. +# NOTE: This was named "gdbserver_download", but that collides with the +# dejagnu "download" API function when using load_generic_config "gdbserver". -proc gdbserver_download { } { +proc gdbserver_download_current_prog { } { global gdbserver_host_exec global gdbserver_host_mtime global gdbserver_server_exec @@ -266,7 +268,7 @@ proc gdbserver_start { options arguments } { # Returns the target protocol and socket to connect to. proc gdbserver_spawn { child_args } { - set target_exec [gdbserver_download] + set target_exec [gdbserver_download_current_prog] # Fire off the debug agent. This flavour of gdbserver takes as # arguments the port information, the name of the executable file to -- 2.30.2