Commita2f7219

authored

feat(board): return adb stdout/err in case of error (#40)

* feat(board): return adb stdout/err in case of error* trigger ci

1 parentda80048 commita2f7219Copy full SHA for a2f7219

File tree

-4

lines changed

-4

lines changed

Lines changed: 5 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -82,12 +82,13 @@ func (a *ADBConnection) Forward(ctx context.Context, localPort int, remotePort i`
`82`	`82`	`iferr!=nil {`
`83`	`83`	`returnerr`
`84`	`84`	`}`
`85`		`-iferr:=cmd.RunWithinContext(ctx);err!=nil {`
	`85`	`+ifout,err:=cmd.RunAndCaptureCombinedOutput(ctx);err!=nil {`
`86`	`86`	`returnfmt.Errorf(`
`87`		`-"failed to forward ADB port %s to %s: %w",`
	`87`	`+"failed to forward ADB port %s to %s: %w: %s",`
`88`	`88`	`local,`
`89`	`89`	`remote,`
`90`	`90`	`err,`
	`91`	`+out,`
`91`	`92`	`)`
`92`	`93`	`}`
`93`	`94`
`@@ -99,8 +100,8 @@ func (a *ADBConnection) ForwardKillAll(ctx context.Context) error {`
`99`	`100`	`iferr!=nil {`
`100`	`101`	`returnerr`
`101`	`102`	`}`
`102`		`-iferr:=cmd.RunWithinContext(ctx);err!=nil {`
`103`		`-returnfmt.Errorf("failed to kill all ADB forwarded ports: %w",err)`
	`103`	`+ifout,err:=cmd.RunAndCaptureCombinedOutput(ctx);err!=nil {`
	`104`	`+returnfmt.Errorf("failed to kill all ADB forwarded ports: %w: %s",err,out)`
`104`	`105`	`}`
`105`	`106`	`returnnil`
`106`	`107`	`}`

Comments

(0)