Ported TestBuilderWithBuildPathInSketchDir to current integration tes…

…t infra

internal/integrationtest/compile_1/compile_test.go

@@ -73,6 +73,7 @@ func TestCompile(t *testing.T) {
 		{"WithRelativeBuildPath", compileWithRelativeBuildPath},
 		{"WithFakeSecureBootCore", compileWithFakeSecureBootCore},
 		{"PreprocessFlagDoNotMessUpWithOutput", preprocessFlagDoNotMessUpWithOutput},
+		{"BuildWithBuildPathInSketchDir", buildWithBuildPathInSketchDir},
 	}.Run(t, env, cli)
 }
 
@@ -1204,3 +1205,18 @@ void loop() {
 	require.NoError(t, err)
 	require.Equal(t, expected, string(output))
 }
+
+func buildWithBuildPathInSketchDir(t *testing.T, env *integrationtest.Environment, cli *integrationtest.ArduinoCLI) {
+	sketchName := "bare_minimum"
+	sketchPath := cli.CopySketch(sketchName)
+	defer sketchPath.RemoveAll()
+	buildPath := sketchPath.Join("build")
+
+	// Run build
+	_, _, err := cli.Run("compile", "-b", "arduino:avr:uno", "--build-path", buildPath.String(), sketchPath.String())
+	require.NoError(t, err)
+
+	// Run build twice, to verify the build still works when the build directory is present at the start
+	_, _, err = cli.Run("compile", "-b", "arduino:avr:uno", "--build-path", buildPath.String(), sketchPath.String())
+	require.NoError(t, err)
+}

legacy/builder/test/builder_test.go

@@ -24,7 +24,6 @@ import (
 	"github.com/arduino/arduino-cli/arduino/builder/detector"
 	"github.com/arduino/arduino-cli/arduino/cores/packagemanager"
 	"github.com/arduino/arduino-cli/arduino/sketch"
-	"github.com/arduino/arduino-cli/legacy/builder"
 	"github.com/arduino/arduino-cli/legacy/builder/constants"
 	"github.com/arduino/arduino-cli/legacy/builder/types"
 	"github.com/arduino/go-paths-helper"
@@ -145,20 +144,3 @@ func prepareBuilderTestContext(t *testing.T, ctx *types.Context, sketchPath *pat
 
 	return ctx
 }
-
-func TestBuilderWithBuildPathInSketchDir(t *testing.T) {
-	buildPath, err := paths.New("sketch1", "build").Abs()
-	NoError(t, err)
-	ctx := prepareBuilderTestContext(t, &types.Context{BuildPath: buildPath}, paths.New("sketch1", "sketch1.ino"), "arduino:avr:uno")
-	defer cleanUpBuilderTestContext(t, ctx)
-
-	// Run build
-	command := builder.Builder{}
-	err = command.Run(ctx)
-	NoError(t, err)
-
-	// Run build twice, to verify the build still works when the
-	// build directory is present at the start
-	err = command.Run(ctx)
-	NoError(t, err)
-}