diff options
| author | Zach Koopmans <zkoopmans@google.com> | 2020-08-27 09:50:53 -0700 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-08-27 09:52:49 -0700 |
| commit | 140ffb60073c74953666be476fd0be13301a3b4d (patch) | |
| tree | 42ac061c1db2106e2cb0200a78399c732416f815 /test/util/pty_util.h | |
| parent | 32e7a54f7f413ba83af8217b9bc0a367e3c30f94 (diff) | |
Fix JobControl tests for open source.
ioctl calls with TIOCSCTTY fail if the calling process already has a
controlling terminal, which occurs on a 5.4 kernel like our Ubuntu 18 CI.
Thus, run tests calling ioctl TTOCSCTTY in clean subprocess.
Also, while we're here, switch out non-inclusive master/slave for main/replica.
PiperOrigin-RevId: 328756598
Diffstat (limited to 'test/util/pty_util.h')
| -rw-r--r-- | test/util/pty_util.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/util/pty_util.h b/test/util/pty_util.h index 0722da379..dff6adab5 100644 --- a/test/util/pty_util.h +++ b/test/util/pty_util.h @@ -21,11 +21,11 @@ namespace gvisor { namespace testing { -// Opens the slave end of the passed master as R/W and nonblocking. -PosixErrorOr<FileDescriptor> OpenSlave(const FileDescriptor& master); +// Opens the replica end of the passed main as R/W and nonblocking. +PosixErrorOr<FileDescriptor> OpenReplica(const FileDescriptor& main); -// Get the number of the slave end of the master. -PosixErrorOr<int> SlaveID(const FileDescriptor& master); +// Get the number of the replica end of the main. +PosixErrorOr<int> ReplicaID(const FileDescriptor& main); } // namespace testing } // namespace gvisor |