diff options
| author | Bryan C. Mills <bcmills@google.com> | 2023-08-16 10:46:11 -0400 |
|---|---|---|
| committer | Bryan Mills <bcmills@google.com> | 2023-08-16 16:39:01 +0000 |
| commit | 9cf209f6b87f46795c3eadbeaceeeca7d429752b (patch) | |
| tree | 4f4bffa2ac337b702a2d23c5dc52505ca0439191 /src/runtime/testdata | |
| parent | 9049d77dbeb3e5fb3134e88fd5686438f054cb2f (diff) | |
| download | go-9cf209f6b87f46795c3eadbeaceeeca7d429752b.tar.xz | |
runtime/testdata/testprog: use testenv.SyscallIsNotSupported to check syscall.Unshare
syscall.Unshare is the sort of system call that may be blocked in a
container environment, and experience has shown that different
container implementations choose from a variety of different error
codes for blocked syscalls.
In particular, the patch in
https://git.alpinelinux.org/aports/tree/community/go/tests-unshare-enosys.patch
seems to suggest that the container environment used to test the Go
distribution on Alpine Linux returns ENOSYS instead of EPERM.
The existing testenv.SyscallIsNotSupported helper checks for
the kinds of error codes we have seen from containers in practice, so
let's use that here.
For #62053.
Updates #29366.
Change-Id: Ic6755f7224fcdc0cb8b25dde2d6047ceb5c3ffdf
Reviewed-on: https://go-review.googlesource.com/c/go/+/520057
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@google.com>
Auto-Submit: Bryan Mills <bcmills@google.com>
Run-TryBot: Bryan Mills <bcmills@google.com>
Diffstat (limited to 'src/runtime/testdata')
| -rw-r--r-- | src/runtime/testdata/testprog/syscalls_linux.go | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/runtime/testdata/testprog/syscalls_linux.go b/src/runtime/testdata/testprog/syscalls_linux.go index 48f8014237..3939b160df 100644 --- a/src/runtime/testdata/testprog/syscalls_linux.go +++ b/src/runtime/testdata/testprog/syscalls_linux.go @@ -7,6 +7,7 @@ package main import ( "bytes" "fmt" + "internal/testenv" "os" "syscall" ) @@ -44,11 +45,8 @@ func getcwd() (string, error) { func unshareFs() error { err := syscall.Unshare(syscall.CLONE_FS) - if err != nil { - errno, ok := err.(syscall.Errno) - if ok && errno == syscall.EPERM { - return errNotPermitted - } + if testenv.SyscallIsNotSupported(err) { + return errNotPermitted } return err } |