From 8c217a4b684386aa5ce6a078dffbe63265a524e6 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Tue, 13 May 2014 17:37:44 -0400 Subject: [PATCH] Fix argument passing in mi_run_cmd_full Passing arguments did not work when use_mi_command was set. gdb/testsuite/ChangeLog: 2014-05-13 Simon Marchi * lib/mi-support.exp (mi_run_cmd_full): Set arguments by calling "-exec-arguments" or "set args" before running the inferior. --- gdb/testsuite/ChangeLog | 6 ++++++ gdb/testsuite/lib/mi-support.exp | 13 ++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index aaab227c1e3..486a4e21f7e 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2014-05-15 Simon Marchi + + * lib/mi-support.exp (mi_run_cmd_full): Set arguments by + calling "-exec-arguments" or "set args" before running the + inferior. + 2014-05-15 Simon Marchi * lib/mi-support.exp (mi_expect_stop): Expect message for diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp index 4478ba0b045..10540388ebd 100644 --- a/gdb/testsuite/lib/mi-support.exp +++ b/gdb/testsuite/lib/mi-support.exp @@ -818,9 +818,11 @@ 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] { @@ -862,7 +864,16 @@ proc mi_run_cmd_full {use_mi_command args} { return 0 } - send_gdb "${run_prefix}run $args\n" + 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" 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}" { } -- 2.30.2