From c3f346a485f2fa97a7bdee82d587419b3823a1ba Mon Sep 17 00:00:00 2001 From: Kir Kolyshkin Date: Thu, 29 Aug 2024 19:51:22 -0700 Subject: math,os,os/*: use testenv.Executable As some callers don't have a testing context, modify testenv.Executable to accept nil (similar to how testenv.GOROOT works). Change-Id: I39112a7869933785a26b5cb6520055b3cc42b847 Reviewed-on: https://go-review.googlesource.com/c/go/+/609835 Reviewed-by: Ian Lance Taylor Auto-Submit: Ian Lance Taylor LUCI-TryBot-Result: Go LUCI Reviewed-by: Dmitri Shuralyov --- src/os/executable_test.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/os/executable_test.go') diff --git a/src/os/executable_test.go b/src/os/executable_test.go index 98b72d7d5e..be3c1dc72d 100644 --- a/src/os/executable_test.go +++ b/src/os/executable_test.go @@ -16,13 +16,9 @@ import ( const executable_EnvVar = "OSTEST_OUTPUT_EXECPATH" func TestExecutable(t *testing.T) { - testenv.MustHaveExec(t) t.Parallel() - ep, err := os.Executable() - if err != nil { - t.Fatalf("Executable failed: %v", err) - } + ep := testenv.Executable(t) // we want fn to be of the form "dir/prog" dir := filepath.Dir(filepath.Dir(ep)) fn, err := filepath.Rel(dir, ep) -- cgit v1.3