qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-23 04:50:06 -07:00
Code Releases Activity

runtime/testdata/testprog: use testenv.SyscallIsNotSupported to check syscall.Unshare

Browse Source 
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>
This commit is contained in:
Bryan C. Mills 2023-08-16 10:46:11 -04:00 committed by Bryan Mills
parent 9049d77dbe
commit 9cf209f6b8
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/runtime/testdata/testprog/syscalls_linux.go vendored
View File

@ -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
}