Move BuildCLI function to testutil package

acceptance/acceptance_test.go

@@ -15,7 +15,6 @@ import (
 	"sort"
 	"strings"
 	"testing"
-	"time"
 
 	"github.com/databricks/cli/internal/testutil"
 	"github.com/databricks/cli/libs/env"
@@ -89,8 +88,10 @@ func testAccept(t *testing.T, InprocessMode bool, singleTest string) int {
 		cmdServer := StartCmdServer(t)
 		t.Setenv("CMD_SERVER_URL", cmdServer.URL)
 		execPath = filepath.Join(cwd, "bin", "callserver.py")
+	} else if coverDir != "" {
+		execPath = testutil.BuildCLI(t, "-cover")
 	} else {
-		execPath = BuildCLI(t, cwd, coverDir)
+		execPath = testutil.BuildCLI(t)
 	}
 
 	t.Setenv("CLI", execPath)
@@ -334,47 +335,6 @@ func readMergedScriptContents(t *testing.T, dir string) string {
 	return strings.Join(prepares, "\n")
 }
 
-func BuildCLI(t *testing.T, cwd, coverDir string) string {
-	execPath := filepath.Join(cwd, "build", "databricks")
-	if runtime.GOOS == "windows" {
-		execPath += ".exe"
-	}
-
-	start := time.Now()
-	args := []string{
-		"go", "build",
-		"-mod", "vendor",
-		"-o", execPath,
-	}
-
-	if coverDir != "" {
-		args = append(args, "-cover")
-	}
-
-	if runtime.GOOS == "windows" {
-		// Get this error on my local Windows:
-		// error obtaining VCS status: exit status 128
-		// Use -buildvcs=false to disable VCS stamping.
-		args = append(args, "-buildvcs=false")
-	}
-
-	cmd := exec.Command(args[0], args[1:]...)
-	cmd.Dir = ".."
-	out, err := cmd.CombinedOutput()
-	elapsed := time.Since(start)
-	t.Logf("%s took %s", args, elapsed)
-	require.NoError(t, err, "go build failed: %s: %s\n%s", args, err, out)
-	if len(out) > 0 {
-		t.Logf("go build output: %s: %s", args, out)
-	}
-
-	// Quick check + warm up cache:
-	cmd = exec.Command(execPath, "--version")
-	out, err = cmd.CombinedOutput()
-	require.NoError(t, err, "%s --version failed: %s\n%s", execPath, err, out)
-	return execPath
-}
-
 func copyFile(src, dst string) error {
 	in, err := os.Open(src)
 	if err != nil {

internal/testutil/build_cli.go

@@ -0,0 +1,55 @@
+package testutil
+
+import (
+	"os/exec"
+	"path/filepath"
+	"runtime"
+	"time"
+
+	"github.com/databricks/cli/libs/folders"
+	"github.com/stretchr/testify/require"
+)
+
+func BuildCLI(t TestingT, flags ...string) string {
+	repoRoot, err := folders.FindDirWithLeaf(".", ".git")
+	require.NoError(t, err)
+
+	// Stable path for the CLI binary. This ensures fast builds and cache reuse.
+	execPath := filepath.Join(repoRoot, "internal", "testutil", "build", "databricks")
+	if runtime.GOOS == "windows" {
+		execPath += ".exe"
+	}
+
+	start := time.Now()
+	args := []string{
+		"go", "build",
+		"-mod", "vendor",
+		"-o", execPath,
+	}
+	if len(flags) > 0 {
+		args = append(args, flags...)
+	}
+
+	if runtime.GOOS == "windows" {
+		// Get this error on my local Windows:
+		// error obtaining VCS status: exit status 128
+		// Use -buildvcs=false to disable VCS stamping.
+		args = append(args, "-buildvcs=false")
+	}
+
+	cmd := exec.Command(args[0], args[1:]...)
+	cmd.Dir = repoRoot
+	out, err := cmd.CombinedOutput()
+	elapsed := time.Since(start)
+	t.Logf("%s took %s", args, elapsed)
+	require.NoError(t, err, "go build failed: %s: %s\n%s", args, err, out)
+	if len(out) > 0 {
+		t.Logf("go build output: %s: %s", args, out)
+	}
+
+	// Quick check + warm up cache:
+	cmd = exec.Command(execPath, "--version")
+	out, err = cmd.CombinedOutput()
+	require.NoError(t, err, "%s --version failed: %s\n%s", execPath, err, out)
+	return execPath
+}