PenaDevops/delve
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

proc/gdbserial: fix passing arguments to target via debugserver (#843)

Browse Source 
Debugserver does not work as documented, "--" needs to be specified to
pass arguments to the target process (but only if it's an argument that
starts with a dash).

Fixes #839
This commit is contained in:
Alessandro Arzilli 2017-05-15 19:11:46 +02:00 committed by Derek Parker
parent 82d142d1cd
commit 8d3e74a445
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/proc/gdbserial/gdbserver.go
View File

@ -332,8 +332,8 @@ func LLDBLaunch(cmd []string, wd string) (*Process, error) {
return nil, err
}
listener.(*net.TCPListener).SetDeadline(time.Now().Add(maxConnectAttempts * time.Second))
args := make([]string, 0, len(cmd)+3)
args = append(args, "-F", "-R", fmt.Sprintf("127.0.0.1:%d", listener.Addr().(*net.TCPAddr).Port))
args := make([]string, 0, len(cmd)+4)
args = append(args, "-F", "-R", fmt.Sprintf("127.0.0.1:%d", listener.Addr().(*net.TCPAddr).Port), "--")
args = append(args, cmd...)
isDebugserver = true

1
pkg/proc/proc_test.go
View File

@ -1910,6 +1910,7 @@ func TestCmdLineArgs(t *testing.T) {
// make sure multiple arguments (including one with spaces) are passed to the binary correctly
withTestProcessArgs("testargs", t, ".", expectSuccess, []string{"test"})
withTestProcessArgs("testargs", t, ".", expectPanic, []string{"-test"})
withTestProcessArgs("testargs", t, ".", expectSuccess, []string{"test", "pass flag"})
// check that arguments with spaces are *only* passed correctly when correctly called
withTestProcessArgs("testargs", t, ".", expectPanic, []string{"test pass", "flag"})