Revert "Fix argument passing in mi_run_cmd_full"

Message ID 1400707368-8524-1-git-send-email-simon.marchi@ericsson.com
State Committed
Headers

Commit Message

Simon Marchi May 21, 2014, 9:22 p.m. UTC
  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".
---
 gdb/testsuite/lib/mi-support.exp | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)
  

Comments

Pedro Alves May 21, 2014, 9:27 p.m. UTC | #1
On 05/21/2014 10:22 PM, Simon Marchi wrote:
> 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.

Thanks!

> 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".

OK

Thanks,
  

Patch

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}" {
 	}