Ported sketch_with_backup_files integration tests out of legacy

internal/integrationtest/compile_4/compile_test.go

@@ -64,7 +64,7 @@ func TestCompileOfProblematicSketches(t *testing.T) {
 		{"SketchWithNamespace", tryBuildAvrLeonardo},
 		{"SketchWithDefaultArgs", tryBuildAvrLeonardo},
 		{"SketchWithClass", tryBuildAvrLeonardo},
-		{"SketchWithBackupFiles", tryBuildAvrLeonardo},
+		{"SketchWithBackupFiles", testBuilderSketchWithBackupFiles},
 		{"SketchWithSubfolders", tryBuildAvrLeonardo},
 	}.Run(t, env, cli)
 }
@@ -105,6 +105,14 @@ func testBuilderSketchWithoutFunctions(t *testing.T, env *integrationtest.Enviro
 	require.Contains(t, preprocessedSketch, "#include <Arduino.h>\n#line 1 "+quotedSketchMainFile+"\n")
 }
 
+func testBuilderSketchWithBackupFiles(t *testing.T, env *integrationtest.Environment, cli *integrationtest.ArduinoCLI) {
+	// Build
+	_, err := tryBuild(t, env, cli, "arduino:avr:leonardo")
+	require.NoError(t, err)
+	_, err = tryBuild(t, env, cli, "arduino:avr:uno")
+	require.NoError(t, err)
+}
+
 func tryBuildAvrLeonardo(t *testing.T, env *integrationtest.Environment, cli *integrationtest.ArduinoCLI) {
 	_, err := tryBuild(t, env, cli, "arduino:avr:leonardo")
 	require.NoError(t, err)

legacy/builder/test/builder_test.go

@@ -258,22 +258,6 @@ func TestBuilderBridgeRedBearLab(t *testing.T) {
 	require.True(t, exist)
 }
 
-func TestBuilderSketchWithBackup(t *testing.T) {
-	ctx := &types.Context{
-		HardwareDirs:         paths.NewPathList(filepath.Join("..", "hardware"), "downloaded_hardware", "downloaded_board_manager_stuff"),
-		BuiltInToolsDirs:     paths.NewPathList("downloaded_tools", "downloaded_board_manager_stuff"),
-		BuiltInLibrariesDirs: paths.New("downloaded_libraries"),
-		OtherLibrariesDirs:   paths.NewPathList("libraries"),
-	}
-	ctx = prepareBuilderTestContext(t, ctx, paths.New("sketch_with_backup_files", "sketch_with_backup_files.ino"), "arduino:avr:uno")
-	defer cleanUpBuilderTestContext(t, ctx)
-
-	// Run builder
-	command := builder.Builder{}
-	err := command.Run(ctx)
-	NoError(t, err)
-}
-
 func TestBuilderSketchWithOldLib(t *testing.T) {
 	ctx := prepareBuilderTestContext(t, nil, paths.New("sketch_with_old_lib", "sketch_with_old_lib.ino"), "arduino:avr:uno")
 	defer cleanUpBuilderTestContext(t, ctx)