aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Evans <dje@google.com>2010-01-12 00:50:26 +0000
committerDoug Evans <dje@google.com>2010-01-12 00:50:26 +0000
commit6496a6093db530ef4ab153eb510eeda17a7301c5 (patch)
tree1fc71e9d5274b3ea8c588d6c16e6cfbf8ec05d28
parent08e24bd4abc31abbc6ff795b95275dc3fe737113 (diff)
downloadgdb-6496a6093db530ef4ab153eb510eeda17a7301c5.zip
gdb-6496a6093db530ef4ab153eb510eeda17a7301c5.tar.gz
gdb-6496a6093db530ef4ab153eb510eeda17a7301c5.tar.bz2
* lib/gdbserver-support.exp (gdbserver_download_current_prog): Rename
from gdbserver_download. All callers updated.
-rw-r--r--gdb/testsuite/ChangeLog3
-rw-r--r--gdb/testsuite/gdb.server/ext-attach.exp2
-rw-r--r--gdb/testsuite/gdb.server/ext-run.exp2
-rw-r--r--gdb/testsuite/lib/gdbserver-support.exp6
4 files changed, 9 insertions, 4 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index b0fcac7..ae6fda9 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,8 @@
2010-01-11 Doug Evans <dje@google.com>
+ * 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 <jan.kratochvil@redhat.com>
diff --git a/gdb/testsuite/gdb.server/ext-attach.exp b/gdb/testsuite/gdb.server/ext-attach.exp
index a00075b..196c56b 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 5797c80..9b140d6 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 d4c5eb8..5d53dfa 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