summaryrefslogtreecommitdiff
path: root/vendor/github.com/onsi/ginkgo/internal
diff options
context:
space:
mode:
Diffstat (limited to 'vendor/github.com/onsi/ginkgo/internal')
-rw-r--r--vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor_darwin.go11
-rw-r--r--vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor_dragonfly.go11
-rw-r--r--vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor_freebsd.go11
-rw-r--r--vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor_linux.go12
-rw-r--r--vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor_linux_mips64le.go12
-rw-r--r--vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor_netbsd.go11
-rw-r--r--vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor_openbsd.go11
-rw-r--r--vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor_solaris.go11
-rw-r--r--vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor_unix.go7
9 files changed, 92 insertions, 5 deletions
diff --git a/vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor_darwin.go b/vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor_darwin.go
new file mode 100644
index 000000000..e3d09eadb
--- /dev/null
+++ b/vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor_darwin.go
@@ -0,0 +1,11 @@
+// +build darwin
+
+package remote
+
+import (
+ "golang.org/x/sys/unix"
+)
+
+func interceptorDupx(oldfd int, newfd int) {
+ unix.Dup2(oldfd, newfd)
+}
diff --git a/vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor_dragonfly.go b/vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor_dragonfly.go
new file mode 100644
index 000000000..72d38686a
--- /dev/null
+++ b/vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor_dragonfly.go
@@ -0,0 +1,11 @@
+// +build dragonfly
+
+package remote
+
+import (
+ "golang.org/x/sys/unix"
+)
+
+func interceptorDupx(oldfd int, newfd int) {
+ unix.Dup2(oldfd, newfd)
+}
diff --git a/vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor_freebsd.go b/vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor_freebsd.go
new file mode 100644
index 000000000..497d548d9
--- /dev/null
+++ b/vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor_freebsd.go
@@ -0,0 +1,11 @@
+// +build freebsd
+
+package remote
+
+import (
+ "golang.org/x/sys/unix"
+)
+
+func interceptorDupx(oldfd int, newfd int) {
+ unix.Dup2(oldfd, newfd)
+}
diff --git a/vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor_linux.go b/vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor_linux.go
new file mode 100644
index 000000000..29add0d33
--- /dev/null
+++ b/vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor_linux.go
@@ -0,0 +1,12 @@
+// +build linux
+// +build !mips64le
+
+package remote
+
+import (
+ "golang.org/x/sys/unix"
+)
+
+func interceptorDupx(oldfd int, newfd int) {
+ unix.Dup2(oldfd, newfd)
+}
diff --git a/vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor_linux_mips64le.go b/vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor_linux_mips64le.go
new file mode 100644
index 000000000..09bd06260
--- /dev/null
+++ b/vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor_linux_mips64le.go
@@ -0,0 +1,12 @@
+// +build linux
+// +build mips64le
+
+package remote
+
+import (
+ "golang.org/x/sys/unix"
+)
+
+func interceptorDupx(oldfd int, newfd int) {
+ unix.Dup3(oldfd, newfd, 0)
+}
diff --git a/vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor_netbsd.go b/vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor_netbsd.go
new file mode 100644
index 000000000..16ad6aeb2
--- /dev/null
+++ b/vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor_netbsd.go
@@ -0,0 +1,11 @@
+// +build netbsd
+
+package remote
+
+import (
+ "golang.org/x/sys/unix"
+)
+
+func interceptorDupx(oldfd int, newfd int) {
+ unix.Dup2(oldfd, newfd)
+}
diff --git a/vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor_openbsd.go b/vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor_openbsd.go
new file mode 100644
index 000000000..4275f8421
--- /dev/null
+++ b/vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor_openbsd.go
@@ -0,0 +1,11 @@
+// +build openbsd
+
+package remote
+
+import (
+ "golang.org/x/sys/unix"
+)
+
+func interceptorDupx(oldfd int, newfd int) {
+ unix.Dup2(oldfd, newfd)
+}
diff --git a/vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor_solaris.go b/vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor_solaris.go
new file mode 100644
index 000000000..882a38a9e
--- /dev/null
+++ b/vendor/github.com/onsi/ginkgo/internal/remote/output_interceptor_solaris.go
@@ -0,0 +1,11 @@
+// +build solaris
+
+package remote
+
+import (
+ "golang.org/x/sys/unix"
+)
+
+func interceptorDupx(oldfd int, newfd int) {
+ unix.Dup2(oldfd, newfd)
+}
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 774967db6..80614d0ce 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,7 +8,6 @@ import (
"os"
"github.com/nxadm/tail"
- "golang.org/x/sys/unix"
)
func NewOutputInterceptor() OutputInterceptor {
@@ -36,10 +35,8 @@ func (interceptor *outputInterceptor) StartInterceptingOutput() error {
return err
}
- // 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)
+ interceptorDupx(int(interceptor.redirectFile.Fd()), 1)
+ interceptorDupx(int(interceptor.redirectFile.Fd()), 2)
if interceptor.streamTarget != nil {
interceptor.tailer, _ = tail.TailFile(interceptor.redirectFile.Name(), tail.Config{Follow: true})