diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-02-02 08:48:52 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-02 08:48:52 -0500 |
| commit | d66a18cb11688060a3ef737dd05758398279f053 (patch) | |
| tree | 8e1766e165c5c134d67ba3834e64ed8ee371e5fa /vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor_unix.go | |
| parent | 828279dac2d9d1a19ca2ed05e6ad09730179821a (diff) | |
| parent | 323ab314ef2623caea7cf51783ec56653781f95d (diff) | |
| download | podman-d66a18cb11688060a3ef737dd05758398279f053.tar.gz podman-d66a18cb11688060a3ef737dd05758398279f053.tar.bz2 podman-d66a18cb11688060a3ef737dd05758398279f053.zip | |
Merge pull request #9195 from containers/dependabot/go_modules/github.com/onsi/ginkgo-1.15.0
Bump github.com/onsi/ginkgo from 1.14.2 to 1.15.0
Diffstat (limited to 'vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor_unix.go')
| -rw-r--r-- | vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor_unix.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor_unix.go b/vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor_unix.go index 80614d0ce..774967db6 100644 --- a/vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor_unix.go +++ b/vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor_unix.go @@ -8,6 +8,7 @@ import ( "os" "github.com/nxadm/tail" + "golang.org/x/sys/unix" ) func NewOutputInterceptor() OutputInterceptor { @@ -35,8 +36,10 @@ func (interceptor *outputInterceptor) StartInterceptingOutput() error { return err } - interceptorDupx(int(interceptor.redirectFile.Fd()), 1) - interceptorDupx(int(interceptor.redirectFile.Fd()), 2) + // This might call Dup3 if the dup2 syscall is not available, e.g. on + // linux/arm64 or linux/riscv64 + unix.Dup2(int(interceptor.redirectFile.Fd()), 1) + unix.Dup2(int(interceptor.redirectFile.Fd()), 2) if interceptor.streamTarget != nil { interceptor.tailer, _ = tail.TailFile(interceptor.redirectFile.Name(), tail.Config{Follow: true}) |