aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Marchi <simon dot marchi at ericsson dot com>2014-05-21 17:22:48 -0400
committerSimon Marchi <simon.marchi@ericsson.com>2014-05-21 17:50:10 -0400
commit2f25d70f5cea857daf0fbda692fd21bbc179a23c (patch)
tree7278b49945b0fce962fa46b2495aed0a90973294
parentc1ee2fb3cb80ce3a7082002797712d5ffce33e21 (diff)
downloadgdb-2f25d70f5cea857daf0fbda692fd21bbc179a23c.zip
gdb-2f25d70f5cea857daf0fbda692fd21bbc179a23c.tar.gz
gdb-2f25d70f5cea857daf0fbda692fd21bbc179a23c.tar.bz2
Revert "Fix argument passing in mi_run_cmd_full"
This reverts commit 8c217a4b684386aa5ce6a078dffbe63265a524e6. Following this https://sourceware.org/ml/gdb-patches/2014-05/msg00462.html I suggest reverting my previous commit. I will follow with another patch to add comments, to clarify some things as stated in the mail thread. I ran make check with on gdb.mi, and the test that the commit broke passes again. gdb/testsuite/ChangeLog: 2014-05-21 Simon Marchi <simon.marchi@ericsson.com> * lib/mi-support.exp (mi_run_cmd_full): Revert to original behavior for $args, pass it directly to "run".
-rw-r--r--gdb/testsuite/ChangeLog5
-rw-r--r--gdb/testsuite/lib/mi-support.exp13
2 files changed, 6 insertions, 12 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index fccceb7..80c0226 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-21 Simon Marchi <simon.marchi@ericsson.com>
+
+ * lib/mi-support.exp (mi_run_cmd_full): Revert to original
+ behavior for $args, pass it directly to "run".
+
2014-05-21 Maciej W. Rozycki <macro@codesourcery.com>
* lib/gdb.exp (default_gdb_init): Bump `match_max' up from
diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp
index afe13e8..6d011b9 100644
--- a/gdb/testsuite/lib/mi-support.exp
+++ b/gdb/testsuite/lib/mi-support.exp
@@ -818,11 +818,9 @@ proc mi_run_cmd_full {use_mi_command args} {
if {$use_mi_command} {
set run_prefix "220-exec-"
set run_match "220"
- set set_args_cmd "-exec-arguments"
} else {
set run_prefix ""
set run_match ""
- set set_args_cmd "set args"
}
if [target_info exists gdb_init_command] {
@@ -864,16 +862,7 @@ proc mi_run_cmd_full {use_mi_command args} {
return 0
}
- send_gdb "${set_args_cmd} $args\n"
- gdb_expect {
- -re "$mi_gdb_prompt$" { }
- default {
- perror "settings args failed"
- return -1
- }
- }
-
- send_gdb "${run_prefix}run\n"
+ send_gdb "${run_prefix}run $args\n"
gdb_expect {
-re "${run_match}\\^running\r\n(\\*running,thread-id=\"\[^\"\]+\"\r\n|=thread-created,id=\"1\",group-id=\"\[0-9\]+\"\r\n)*(${library_loaded_re})*(${thread_selected_re})?${mi_gdb_prompt}" {
}