diff options
| author | Austin Clements <austin@google.com> | 2022-11-10 16:02:48 -0500 |
|---|---|---|
| committer | Austin Clements <austin@google.com> | 2022-11-16 19:00:19 +0000 |
| commit | 334d8e453b5d45ede5265debc51b4775195d9ce9 (patch) | |
| tree | 5618db8d56d563e9c52f62b28ece838684116fcb /src/os | |
| parent | 80d8c77a43f2445a78bd5b5c3b113c95e49766a9 (diff) | |
| download | go-334d8e453b5d45ede5265debc51b4775195d9ce9.tar.xz | |
internal/testpty: move from os/signal/internal/pty
We're going to use this for another test, so make it more accessible.
Preparation for #37486.
Change-Id: If194cc4244c4b9e1b1f253759b813555b39ad67e
Reviewed-on: https://go-review.googlesource.com/c/go/+/449502
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Bryan Mills <bcmills@google.com>
Run-TryBot: Austin Clements <austin@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Diffstat (limited to 'src/os')
| -rw-r--r-- | src/os/signal/internal/pty/pty.go | 37 | ||||
| -rw-r--r-- | src/os/signal/internal/pty/pty_cgo.go | 34 | ||||
| -rw-r--r-- | src/os/signal/internal/pty/pty_darwin.go | 32 | ||||
| -rw-r--r-- | src/os/signal/signal_cgo_test.go | 6 |
4 files changed, 3 insertions, 106 deletions
diff --git a/src/os/signal/internal/pty/pty.go b/src/os/signal/internal/pty/pty.go deleted file mode 100644 index 4bb0391036..0000000000 --- a/src/os/signal/internal/pty/pty.go +++ /dev/null @@ -1,37 +0,0 @@ -// Copyright 2017 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -//go:build ((aix || dragonfly || freebsd || (linux && !android) || netbsd || openbsd) && cgo) || darwin - -// Package pty is a simple pseudo-terminal package for Unix systems, -// implemented by calling C functions via cgo. -// This is only used for testing the os/signal package. -package pty - -import ( - "fmt" - "os" - "syscall" -) - -type PtyError struct { - FuncName string - ErrorString string - Errno syscall.Errno -} - -func ptyError(name string, err error) *PtyError { - return &PtyError{name, err.Error(), err.(syscall.Errno)} -} - -func (e *PtyError) Error() string { - return fmt.Sprintf("%s: %s", e.FuncName, e.ErrorString) -} - -func (e *PtyError) Unwrap() error { return e.Errno } - -// Open returns a control pty and the name of the linked process tty. -func Open() (pty *os.File, processTTY string, err error) { - return open() -} diff --git a/src/os/signal/internal/pty/pty_cgo.go b/src/os/signal/internal/pty/pty_cgo.go deleted file mode 100644 index 47ca71bc65..0000000000 --- a/src/os/signal/internal/pty/pty_cgo.go +++ /dev/null @@ -1,34 +0,0 @@ -// Copyright 2017 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -//go:build cgo && (aix || dragonfly || freebsd || (linux && !android) || netbsd || openbsd) - -package pty - -/* -#define _XOPEN_SOURCE 600 -#include <fcntl.h> -#include <stdlib.h> -#include <unistd.h> -*/ -import "C" - -import "os" - -func open() (pty *os.File, processTTY string, err error) { - m, err := C.posix_openpt(C.O_RDWR) - if err != nil { - return nil, "", ptyError("posix_openpt", err) - } - if _, err := C.grantpt(m); err != nil { - C.close(m) - return nil, "", ptyError("grantpt", err) - } - if _, err := C.unlockpt(m); err != nil { - C.close(m) - return nil, "", ptyError("unlockpt", err) - } - processTTY = C.GoString(C.ptsname(m)) - return os.NewFile(uintptr(m), "pty"), processTTY, nil -} diff --git a/src/os/signal/internal/pty/pty_darwin.go b/src/os/signal/internal/pty/pty_darwin.go deleted file mode 100644 index 6fc49f3c9a..0000000000 --- a/src/os/signal/internal/pty/pty_darwin.go +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright 2017 The Go Authors. All rights reserved. -// Use of this source code is governed by a BSD-style -// license that can be found in the LICENSE file. - -package pty - -import ( - "internal/syscall/unix" - "os" - "syscall" -) - -func open() (pty *os.File, processTTY string, err error) { - m, err := unix.PosixOpenpt(syscall.O_RDWR) - if err != nil { - return nil, "", ptyError("posix_openpt", err) - } - if err := unix.Grantpt(m); err != nil { - syscall.Close(m) - return nil, "", ptyError("grantpt", err) - } - if err := unix.Unlockpt(m); err != nil { - syscall.Close(m) - return nil, "", ptyError("unlockpt", err) - } - processTTY, err = unix.Ptsname(m) - if err != nil { - syscall.Close(m) - return nil, "", ptyError("ptsname", err) - } - return os.NewFile(uintptr(m), "pty"), processTTY, nil -} diff --git a/src/os/signal/signal_cgo_test.go b/src/os/signal/signal_cgo_test.go index 5cfb00632d..ac5921591e 100644 --- a/src/os/signal/signal_cgo_test.go +++ b/src/os/signal/signal_cgo_test.go @@ -14,10 +14,10 @@ import ( "context" "encoding/binary" "fmt" + "internal/testpty" "os" "os/exec" "os/signal" - ptypkg "os/signal/internal/pty" "runtime" "strconv" "syscall" @@ -105,9 +105,9 @@ func TestTerminalSignal(t *testing.T) { t.Parallel() - pty, procTTYName, err := ptypkg.Open() + pty, procTTYName, err := testpty.Open() if err != nil { - ptyErr := err.(*ptypkg.PtyError) + ptyErr := err.(*testpty.PtyError) if ptyErr.FuncName == "posix_openpt" && ptyErr.Errno == syscall.EACCES { t.Skip("posix_openpt failed with EACCES, assuming chroot and skipping") } |
