Skip to content

Commit 4ded826

Browse files
authored
Make it easier to debug integration tests (#4488)
By teeing the output here, something like `bazel test tests/core/from_go_mod_file:all --test_output=streamed` will now stream the underlying build progress as one would hope
1 parent e3ec029 commit 4ded826

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

go/tools/bazel_testing/bazel_testing.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import (
2626
"flag"
2727
"fmt"
2828
"io"
29-
"io/ioutil"
3029
"os"
3130
"os/exec"
3231
"os/signal"
@@ -205,7 +204,7 @@ func RunBazel(args ...string) error {
205204
cmd := BazelCmd(args...)
206205

207206
buf := &bytes.Buffer{}
208-
cmd.Stderr = buf
207+
cmd.Stderr = io.MultiWriter(os.Stderr, buf)
209208
err := cmd.Run()
210209
if eErr, ok := err.(*exec.ExitError); ok {
211210
eErr.Stderr = buf.Bytes()
@@ -234,7 +233,7 @@ func BazelOutputWithInput(stdin io.Reader, args ...string) ([]byte, []byte, erro
234233
stdout := &bytes.Buffer{}
235234
stderr := &bytes.Buffer{}
236235
cmd.Stdout = stdout
237-
cmd.Stderr = stderr
236+
cmd.Stderr = io.MultiWriter(os.Stderr, stderr)
238237
if stdin != nil {
239238
cmd.Stdin = stdin
240239
}
@@ -460,7 +459,7 @@ func extractTxtar(dir, txt string) error {
460459
return err
461460
}
462461
}
463-
if err := ioutil.WriteFile(filepath.Join(dir, f.Name), f.Data, 0666); err != nil {
462+
if err := os.WriteFile(filepath.Join(dir, f.Name), f.Data, 0666); err != nil {
464463
return err
465464
}
466465
}

0 commit comments

Comments
 (0)