From 35d05060158d6e6b3637c4f57f3ac38b47c55f74 Mon Sep 17 00:00:00 2001 From: Denis Bilenko Date: Wed, 11 Jun 2025 11:24:15 +0200 Subject: [PATCH 1/3] acc: include tools in PATH --- acceptance/acceptance_test.go | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/acceptance/acceptance_test.go b/acceptance/acceptance_test.go index 3c09fe772d..4f7f3e2fc8 100644 --- a/acceptance/acceptance_test.go +++ b/acceptance/acceptance_test.go @@ -149,8 +149,16 @@ func testAccept(t *testing.T, inprocessMode bool, singleTest string) int { t.Setenv("CLI", execPath) repls.SetPath(execPath, "[CLI]") - // Make helper scripts available - t.Setenv("PATH", fmt.Sprintf("%s%c%s", filepath.Join(cwd, "bin"), os.PathListSeparator, os.Getenv("PATH"))) + paths := []string{ + // Make helper scripts available + filepath.Join(cwd, "bin"), + + // Make tools scripts available (e.g. yamlfmt) + filepath.Join(cwd, "..", "tools"), + + os.Getenv("PATH"), + } + t.Setenv("PATH", strings.Join(paths, string(os.PathListSeparator))) tempHomeDir := t.TempDir() repls.SetPath(tempHomeDir, "[TMPHOME]") From 6306cfe811a53e6d3ef8c1c73765ccad479e1f74 Mon Sep 17 00:00:00 2001 From: Denis Bilenko Date: Wed, 11 Jun 2025 12:19:22 +0200 Subject: [PATCH 2/3] Update comment acceptance_test.go --- acceptance/acceptance_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/acceptance/acceptance_test.go b/acceptance/acceptance_test.go index 4f7f3e2fc8..6cc8f982a8 100644 --- a/acceptance/acceptance_test.go +++ b/acceptance/acceptance_test.go @@ -153,7 +153,7 @@ func testAccept(t *testing.T, inprocessMode bool, singleTest string) int { // Make helper scripts available filepath.Join(cwd, "bin"), - // Make tools scripts available (e.g. yamlfmt) + // Make ./tools/ available (e.g. yamlfmt) filepath.Join(cwd, "..", "tools"), os.Getenv("PATH"), From bb779cdf346a3add8a3dd987d2b1e66c37c6571c Mon Sep 17 00:00:00 2001 From: Denis Bilenko Date: Wed, 11 Jun 2025 12:19:52 +0200 Subject: [PATCH 3/3] Update comment in acceptance_test.go --- acceptance/acceptance_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/acceptance/acceptance_test.go b/acceptance/acceptance_test.go index 6cc8f982a8..e8448ee8ed 100644 --- a/acceptance/acceptance_test.go +++ b/acceptance/acceptance_test.go @@ -153,7 +153,7 @@ func testAccept(t *testing.T, inprocessMode bool, singleTest string) int { // Make helper scripts available filepath.Join(cwd, "bin"), - // Make ./tools/ available (e.g. yamlfmt) + // Make /tools/ available (e.g. yamlfmt) filepath.Join(cwd, "..", "tools"), os.Getenv("PATH"),