From b7cbcf0c274a0e9f9703468c8ea1d511efe90c5e Mon Sep 17 00:00:00 2001 From: Dmitri Shuralyov Date: Thu, 2 Nov 2023 14:36:30 -0400 Subject: [PATCH] syscall: copy rlimit.go's build constraint to rlimit_test.go Tests in rlimit_test.go exist to test the behavior of automatically bumping RLIMIT_NOFILE on Unix implemented in rlimit.go (issue #46279), with darwin-specific behavior split out into rlimit_darwin.go and the rest left empty in rlimit_stub.go. Since the behavior happens only on Unix, it doesn't make sense to test it on other platforms. Copy rlimit.go's 'unix' build constraint to rlimit_test.go to accomplish that. Also simplify the build constraint in rlimit_stub.go while here, so that its maintenance is easier and it starts to match all non-darwin Unix GOOS values (previously, 'hurd' happened to be missed). In particular, this fixes a problem where TestOpenFileLimit was failing in some environments when testing the wasip1/wasm port. The RLIMIT_NOFILE bumping behavior isn't implemented there, so the test was testing the environment and not the Go project. Updates #46279. For #61116. Change-Id: Ic993f9cfc021d4cda4fe3d7fed8e2e180f78a2ca Reviewed-on: https://go-review.googlesource.com/c/go/+/539435 Reviewed-by: Johan Brandhorst-Satzkorn Reviewed-by: Bryan Mills LUCI-TryBot-Result: Go LUCI Reviewed-by: Dmitri Shuralyov Auto-Submit: Dmitri Shuralyov --- src/syscall/rlimit_stub.go | 2 +- src/syscall/rlimit_test.go | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/syscall/rlimit_stub.go b/src/syscall/rlimit_stub.go index e8f839dd99..7daa935dd5 100644 --- a/src/syscall/rlimit_stub.go +++ b/src/syscall/rlimit_stub.go @@ -2,7 +2,7 @@ // 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 || netbsd || openbsd || solaris +//go:build unix && !darwin package syscall diff --git a/src/syscall/rlimit_test.go b/src/syscall/rlimit_test.go index e48f45e3aa..764694fe2d 100644 --- a/src/syscall/rlimit_test.go +++ b/src/syscall/rlimit_test.go @@ -2,6 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. +//go:build unix + package syscall_test import ( -- 2.48.1