Skip to content

Commit a2f7219

Browse files
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 parent da80048 commit a2f7219

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

pkg/board/remote/adb/adb.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,13 @@ func (a *ADBConnection) Forward(ctx context.Context, localPort int, remotePort i
8282
if err != nil {
8383
return err
8484
}
85-
if err := cmd.RunWithinContext(ctx); err != nil {
85+
if out, err := cmd.RunAndCaptureCombinedOutput(ctx); err != nil {
8686
return fmt.Errorf(
87-
"failed to forward ADB port %s to %s: %w",
87+
"failed to forward ADB port %s to %s: %w: %s",
8888
local,
8989
remote,
9090
err,
91+
out,
9192
)
9293
}
9394

@@ -99,8 +100,8 @@ func (a *ADBConnection) ForwardKillAll(ctx context.Context) error {
99100
if err != nil {
100101
return err
101102
}
102-
if err := cmd.RunWithinContext(ctx); err != nil {
103-
return fmt.Errorf("failed to kill all ADB forwarded ports: %w", err)
103+
if out, err := cmd.RunAndCaptureCombinedOutput(ctx); err != nil {
104+
return fmt.Errorf("failed to kill all ADB forwarded ports: %w: %s", err, out)
104105
}
105106
return nil
106107
}

0 commit comments

Comments
 (0)