From dbe7d8a524a9346b85a047791269fc57e66d594f Mon Sep 17 00:00:00 2001 From: Alessio Perugini Date: Thu, 31 Aug 2023 10:02:40 +0200 Subject: [PATCH 1/6] refactor AddAdditionalEntriesToContext in a function --- .../add_additional_entries_to_context.go | 34 ++++++++----------- legacy/builder/container_setup.go | 12 ++++++- 2 files changed, 26 insertions(+), 20 deletions(-) diff --git a/legacy/builder/add_additional_entries_to_context.go b/legacy/builder/add_additional_entries_to_context.go index 9e9fdd80669..c35fc3bdaa3 100644 --- a/legacy/builder/add_additional_entries_to_context.go +++ b/legacy/builder/add_additional_entries_to_context.go @@ -18,37 +18,33 @@ package builder import ( "github.com/arduino/arduino-cli/legacy/builder/constants" "github.com/arduino/arduino-cli/legacy/builder/types" + "github.com/arduino/go-paths-helper" "github.com/pkg/errors" ) -type AddAdditionalEntriesToContext struct{} +func AddAdditionalEntriesToContext(buildPath *paths.Path, warningLevel string) (*paths.Path, *paths.Path, *paths.Path, string, map[string]types.LibraryResolutionResult, error) { + var sketchBuildPath, librariesBuildPath, coreBuildPath *paths.Path + var err error -func (*AddAdditionalEntriesToContext) Run(ctx *types.Context) error { - if ctx.BuildPath != nil { - buildPath := ctx.BuildPath - sketchBuildPath, err := buildPath.Join(constants.FOLDER_SKETCH).Abs() + if buildPath != nil { + bPath := buildPath + sketchBuildPath, err = bPath.Join(constants.FOLDER_SKETCH).Abs() if err != nil { - return errors.WithStack(err) + return nil, nil, nil, "", nil, errors.WithStack(err) } - librariesBuildPath, err := buildPath.Join(constants.FOLDER_LIBRARIES).Abs() + librariesBuildPath, err = bPath.Join(constants.FOLDER_LIBRARIES).Abs() if err != nil { - return errors.WithStack(err) + return nil, nil, nil, "", nil, errors.WithStack(err) } - coreBuildPath, err := buildPath.Join(constants.FOLDER_CORE).Abs() + coreBuildPath, err = bPath.Join(constants.FOLDER_CORE).Abs() if err != nil { - return errors.WithStack(err) + return nil, nil, nil, "", nil, errors.WithStack(err) } - - ctx.SketchBuildPath = sketchBuildPath - ctx.LibrariesBuildPath = librariesBuildPath - ctx.CoreBuildPath = coreBuildPath } - if ctx.WarningsLevel == "" { - ctx.WarningsLevel = DEFAULT_WARNINGS_LEVEL + if warningLevel == "" { + warningLevel = DEFAULT_WARNINGS_LEVEL } - ctx.LibrariesResolutionResults = map[string]types.LibraryResolutionResult{} - - return nil + return sketchBuildPath, librariesBuildPath, coreBuildPath, warningLevel, map[string]types.LibraryResolutionResult{}, nil } diff --git a/legacy/builder/container_setup.go b/legacy/builder/container_setup.go index 3a00ff6edaa..910586fed51 100644 --- a/legacy/builder/container_setup.go +++ b/legacy/builder/container_setup.go @@ -23,8 +23,18 @@ import ( type ContainerSetupHardwareToolsLibsSketchAndProps struct{} func (s *ContainerSetupHardwareToolsLibsSketchAndProps) Run(ctx *types.Context) error { + sketchBuildPath, librariesBuildPath, coreBuildPath, + warningsLevel, librariesResolutionResults, err := AddAdditionalEntriesToContext(ctx.BuildPath, ctx.WarningsLevel) + if err != nil { + return errors.WithStack(err) + } + ctx.SketchBuildPath = sketchBuildPath + ctx.LibrariesBuildPath = librariesBuildPath + ctx.CoreBuildPath = coreBuildPath + ctx.WarningsLevel = warningsLevel + ctx.LibrariesResolutionResults = librariesResolutionResults + commands := []types.Command{ - &AddAdditionalEntriesToContext{}, &FailIfBuildPathEqualsSketchPath{}, &LibrariesLoader{}, } From e2dfe6742718e927910270ebf6a6fb3e6d0047f3 Mon Sep 17 00:00:00 2001 From: Alessio Perugini Date: Thu, 31 Aug 2023 10:14:44 +0200 Subject: [PATCH 2/6] use the new function in all the tests --- .../add_additional_entries_to_context_test.go | 30 +++++++------- legacy/builder/test/hardware_loader_test.go | 15 +++---- legacy/builder/test/libraries_loader_test.go | 40 +++++++++++++++++-- legacy/builder/test/recipe_runner_test.go | 10 ++++- .../test/setup_build_properties_test.go | 30 +++++++------- 5 files changed, 85 insertions(+), 40 deletions(-) diff --git a/legacy/builder/test/add_additional_entries_to_context_test.go b/legacy/builder/test/add_additional_entries_to_context_test.go index fc1edb5acb2..e39cc2a4984 100644 --- a/legacy/builder/test/add_additional_entries_to_context_test.go +++ b/legacy/builder/test/add_additional_entries_to_context_test.go @@ -28,30 +28,32 @@ import ( func TestAddAdditionalEntriesToContextNoBuildPath(t *testing.T) { ctx := &types.Context{} - command := builder.AddAdditionalEntriesToContext{} - NoError(t, command.Run(ctx)) + sketchBuildPath, librariesBuildPath, coreBuildPath, + warningsLevel, librariesResolutionResults, err := builder.AddAdditionalEntriesToContext(ctx.BuildPath, ctx.WarningsLevel) + NoError(t, err) - require.Empty(t, ctx.SketchBuildPath) - require.Empty(t, ctx.LibrariesBuildPath) - require.Empty(t, ctx.CoreBuildPath) + require.Empty(t, sketchBuildPath) + require.Empty(t, librariesBuildPath) + require.Empty(t, coreBuildPath) - require.NotNil(t, ctx.WarningsLevel) + require.NotNil(t, warningsLevel) - require.Equal(t, 0, len(ctx.LibrariesResolutionResults)) + require.Equal(t, 0, len(librariesResolutionResults)) } func TestAddAdditionalEntriesToContextWithBuildPath(t *testing.T) { ctx := &types.Context{} ctx.BuildPath = paths.New("folder") - command := builder.AddAdditionalEntriesToContext{} - NoError(t, command.Run(ctx)) + sketchBuildPath, librariesBuildPath, coreBuildPath, + warningsLevel, librariesResolutionResults, err := builder.AddAdditionalEntriesToContext(ctx.BuildPath, ctx.WarningsLevel) + NoError(t, err) - require.Equal(t, Abs(t, paths.New("folder", constants.FOLDER_SKETCH)), ctx.SketchBuildPath) - require.Equal(t, Abs(t, paths.New("folder", "libraries")), ctx.LibrariesBuildPath) - require.Equal(t, Abs(t, paths.New("folder", constants.FOLDER_CORE)), ctx.CoreBuildPath) + require.Equal(t, Abs(t, paths.New("folder", constants.FOLDER_SKETCH)), sketchBuildPath) + require.Equal(t, Abs(t, paths.New("folder", "libraries")), librariesBuildPath) + require.Equal(t, Abs(t, paths.New("folder", constants.FOLDER_CORE)), coreBuildPath) - require.NotNil(t, ctx.WarningsLevel) + require.NotNil(t, warningsLevel) - require.Equal(t, 0, len(ctx.LibrariesResolutionResults)) + require.Equal(t, 0, len(librariesResolutionResults)) } diff --git a/legacy/builder/test/hardware_loader_test.go b/legacy/builder/test/hardware_loader_test.go index f900ad38ac3..120ceb2148c 100644 --- a/legacy/builder/test/hardware_loader_test.go +++ b/legacy/builder/test/hardware_loader_test.go @@ -69,13 +69,14 @@ func TestLoadHardwareMixingUserHardwareFolder(t *testing.T) { ctx = prepareBuilderTestContext(t, ctx, nil, "") defer cleanUpBuilderTestContext(t, ctx) - commands := []types.Command{ - &builder.AddAdditionalEntriesToContext{}, - } - for _, command := range commands { - err := command.Run(ctx) - NoError(t, err) - } + sketchBuildPath, librariesBuildPath, coreBuildPath, + warningsLevel, librariesResolutionResults, err := builder.AddAdditionalEntriesToContext(ctx.BuildPath, ctx.WarningsLevel) + NoError(t, err) + ctx.SketchBuildPath = sketchBuildPath + ctx.LibrariesBuildPath = librariesBuildPath + ctx.CoreBuildPath = coreBuildPath + ctx.WarningsLevel = warningsLevel + ctx.LibrariesResolutionResults = librariesResolutionResults packages := ctx.PackageManager.GetPackages() diff --git a/legacy/builder/test/libraries_loader_test.go b/legacy/builder/test/libraries_loader_test.go index 143c1866221..180a5374c63 100644 --- a/legacy/builder/test/libraries_loader_test.go +++ b/legacy/builder/test/libraries_loader_test.go @@ -47,8 +47,16 @@ func TestLoadLibrariesAVR(t *testing.T) { ctx = prepareBuilderTestContext(t, ctx, nil, "arduino:avr:leonardo") defer cleanUpBuilderTestContext(t, ctx) + sketchBuildPath, librariesBuildPath, coreBuildPath, + warningsLevel, librariesResolutionResults, err := builder.AddAdditionalEntriesToContext(ctx.BuildPath, ctx.WarningsLevel) + NoError(t, err) + ctx.SketchBuildPath = sketchBuildPath + ctx.LibrariesBuildPath = librariesBuildPath + ctx.CoreBuildPath = coreBuildPath + ctx.WarningsLevel = warningsLevel + ctx.LibrariesResolutionResults = librariesResolutionResults + commands := []types.Command{ - &builder.AddAdditionalEntriesToContext{}, &builder.LibrariesLoader{}, } for _, command := range commands { @@ -153,8 +161,16 @@ func TestLoadLibrariesSAM(t *testing.T) { ctx = prepareBuilderTestContext(t, ctx, nil, "arduino:sam:arduino_due_x_dbg") defer cleanUpBuilderTestContext(t, ctx) + sketchBuildPath, librariesBuildPath, coreBuildPath, + warningsLevel, librariesResolutionResults, err := builder.AddAdditionalEntriesToContext(ctx.BuildPath, ctx.WarningsLevel) + NoError(t, err) + ctx.SketchBuildPath = sketchBuildPath + ctx.LibrariesBuildPath = librariesBuildPath + ctx.CoreBuildPath = coreBuildPath + ctx.WarningsLevel = warningsLevel + ctx.LibrariesResolutionResults = librariesResolutionResults + commands := []types.Command{ - &builder.AddAdditionalEntriesToContext{}, &builder.LibrariesLoader{}, } for _, command := range commands { @@ -232,8 +248,16 @@ func TestLoadLibrariesAVRNoDuplicateLibrariesFolders(t *testing.T) { ctx = prepareBuilderTestContext(t, ctx, nil, "arduino:avr:leonardo") defer cleanUpBuilderTestContext(t, ctx) + sketchBuildPath, librariesBuildPath, coreBuildPath, + warningsLevel, librariesResolutionResults, err := builder.AddAdditionalEntriesToContext(ctx.BuildPath, ctx.WarningsLevel) + NoError(t, err) + ctx.SketchBuildPath = sketchBuildPath + ctx.LibrariesBuildPath = librariesBuildPath + ctx.CoreBuildPath = coreBuildPath + ctx.WarningsLevel = warningsLevel + ctx.LibrariesResolutionResults = librariesResolutionResults + commands := []types.Command{ - &builder.AddAdditionalEntriesToContext{}, &builder.LibrariesLoader{}, } for _, command := range commands { @@ -257,8 +281,16 @@ func TestLoadLibrariesMyAVRPlatform(t *testing.T) { ctx = prepareBuilderTestContext(t, ctx, nil, "my_avr_platform:avr:custom_yun") defer cleanUpBuilderTestContext(t, ctx) + sketchBuildPath, librariesBuildPath, coreBuildPath, + warningsLevel, librariesResolutionResults, err := builder.AddAdditionalEntriesToContext(ctx.BuildPath, ctx.WarningsLevel) + NoError(t, err) + ctx.SketchBuildPath = sketchBuildPath + ctx.LibrariesBuildPath = librariesBuildPath + ctx.CoreBuildPath = coreBuildPath + ctx.WarningsLevel = warningsLevel + ctx.LibrariesResolutionResults = librariesResolutionResults + commands := []types.Command{ - &builder.AddAdditionalEntriesToContext{}, &builder.LibrariesLoader{}, } for _, command := range commands { diff --git a/legacy/builder/test/recipe_runner_test.go b/legacy/builder/test/recipe_runner_test.go index 6fb90bf7e68..ad21730ce1d 100644 --- a/legacy/builder/test/recipe_runner_test.go +++ b/legacy/builder/test/recipe_runner_test.go @@ -34,8 +34,16 @@ func TestRecipeRunner(t *testing.T) { buildProperties.Set("recipe.hooks.prebuild.1.pattern", "echo") + sketchBuildPath, librariesBuildPath, coreBuildPath, + warningsLevel, librariesResolutionResults, err := builder.AddAdditionalEntriesToContext(ctx.BuildPath, ctx.WarningsLevel) + NoError(t, err) + ctx.SketchBuildPath = sketchBuildPath + ctx.LibrariesBuildPath = librariesBuildPath + ctx.CoreBuildPath = coreBuildPath + ctx.WarningsLevel = warningsLevel + ctx.LibrariesResolutionResults = librariesResolutionResults + commands := []types.Command{ - &builder.AddAdditionalEntriesToContext{}, &builder.RecipeByPrefixSuffixRunner{Prefix: "recipe.hooks.prebuild", Suffix: ".pattern"}, } diff --git a/legacy/builder/test/setup_build_properties_test.go b/legacy/builder/test/setup_build_properties_test.go index 1b595d5d69c..4d577da17b7 100644 --- a/legacy/builder/test/setup_build_properties_test.go +++ b/legacy/builder/test/setup_build_properties_test.go @@ -34,13 +34,14 @@ func TestSetupBuildProperties(t *testing.T) { ctx = prepareBuilderTestContext(t, ctx, paths.New("sketch1", "sketch1.ino"), "arduino:avr:uno") defer cleanUpBuilderTestContext(t, ctx) - commands := []types.Command{ - &builder.AddAdditionalEntriesToContext{}, - } - for _, command := range commands { - err := command.Run(ctx) - NoError(t, err) - } + sketchBuildPath, librariesBuildPath, coreBuildPath, + warningsLevel, librariesResolutionResults, err := builder.AddAdditionalEntriesToContext(ctx.BuildPath, ctx.WarningsLevel) + NoError(t, err) + ctx.SketchBuildPath = sketchBuildPath + ctx.LibrariesBuildPath = librariesBuildPath + ctx.CoreBuildPath = coreBuildPath + ctx.WarningsLevel = warningsLevel + ctx.LibrariesResolutionResults = librariesResolutionResults buildProperties := ctx.BuildProperties @@ -108,13 +109,14 @@ func TestSetupBuildPropertiesUserHardware(t *testing.T) { ctx = prepareBuilderTestContext(t, ctx, paths.New("sketch1", "sketch1.ino"), "my_avr_platform:avr:custom_yun") defer cleanUpBuilderTestContext(t, ctx) - commands := []types.Command{ - &builder.AddAdditionalEntriesToContext{}, - } - for _, command := range commands { - err := command.Run(ctx) - NoError(t, err) - } + sketchBuildPath, librariesBuildPath, coreBuildPath, + warningsLevel, librariesResolutionResults, err := builder.AddAdditionalEntriesToContext(ctx.BuildPath, ctx.WarningsLevel) + NoError(t, err) + ctx.SketchBuildPath = sketchBuildPath + ctx.LibrariesBuildPath = librariesBuildPath + ctx.CoreBuildPath = coreBuildPath + ctx.WarningsLevel = warningsLevel + ctx.LibrariesResolutionResults = librariesResolutionResults buildProperties := ctx.BuildProperties From eaf6ee3cc714e43149f03b1d63d3fa74e95c1fee Mon Sep 17 00:00:00 2001 From: Alessio Perugini Date: Thu, 31 Aug 2023 17:28:32 +0200 Subject: [PATCH 3/6] Move the assignaton of LibrariesResolutionResults inside the ResolveLibrary func The ResolveLibrary func is only called by the ContainerFindIncludes --- legacy/builder/add_additional_entries_to_context.go | 11 +++++------ legacy/builder/container_find_includes.go | 4 ++++ legacy/builder/container_setup.go | 3 +-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/legacy/builder/add_additional_entries_to_context.go b/legacy/builder/add_additional_entries_to_context.go index c35fc3bdaa3..ce98ff4dab6 100644 --- a/legacy/builder/add_additional_entries_to_context.go +++ b/legacy/builder/add_additional_entries_to_context.go @@ -17,12 +17,11 @@ package builder import ( "github.com/arduino/arduino-cli/legacy/builder/constants" - "github.com/arduino/arduino-cli/legacy/builder/types" "github.com/arduino/go-paths-helper" "github.com/pkg/errors" ) -func AddAdditionalEntriesToContext(buildPath *paths.Path, warningLevel string) (*paths.Path, *paths.Path, *paths.Path, string, map[string]types.LibraryResolutionResult, error) { +func AddAdditionalEntriesToContext(buildPath *paths.Path, warningLevel string) (*paths.Path, *paths.Path, *paths.Path, string, error) { var sketchBuildPath, librariesBuildPath, coreBuildPath *paths.Path var err error @@ -30,15 +29,15 @@ func AddAdditionalEntriesToContext(buildPath *paths.Path, warningLevel string) ( bPath := buildPath sketchBuildPath, err = bPath.Join(constants.FOLDER_SKETCH).Abs() if err != nil { - return nil, nil, nil, "", nil, errors.WithStack(err) + return nil, nil, nil, "", errors.WithStack(err) } librariesBuildPath, err = bPath.Join(constants.FOLDER_LIBRARIES).Abs() if err != nil { - return nil, nil, nil, "", nil, errors.WithStack(err) + return nil, nil, nil, "", errors.WithStack(err) } coreBuildPath, err = bPath.Join(constants.FOLDER_CORE).Abs() if err != nil { - return nil, nil, nil, "", nil, errors.WithStack(err) + return nil, nil, nil, "", errors.WithStack(err) } } @@ -46,5 +45,5 @@ func AddAdditionalEntriesToContext(buildPath *paths.Path, warningLevel string) ( warningLevel = DEFAULT_WARNINGS_LEVEL } - return sketchBuildPath, librariesBuildPath, coreBuildPath, warningLevel, map[string]types.LibraryResolutionResult{}, nil + return sketchBuildPath, librariesBuildPath, coreBuildPath, warningLevel, nil } diff --git a/legacy/builder/container_find_includes.go b/legacy/builder/container_find_includes.go index 5d849b927ed..55b60347898 100644 --- a/legacy/builder/container_find_includes.go +++ b/legacy/builder/container_find_includes.go @@ -447,6 +447,10 @@ func ResolveLibrary(ctx *types.Context, header string) *libraries.Library { resolver := ctx.LibrariesResolver importedLibraries := ctx.ImportedLibraries + if ctx.LibrariesResolutionResults == nil { + ctx.LibrariesResolutionResults = map[string]types.LibraryResolutionResult{} + } + candidates := resolver.AlternativesFor(header) if ctx.Verbose { diff --git a/legacy/builder/container_setup.go b/legacy/builder/container_setup.go index 910586fed51..8a99df5c8a9 100644 --- a/legacy/builder/container_setup.go +++ b/legacy/builder/container_setup.go @@ -24,7 +24,7 @@ type ContainerSetupHardwareToolsLibsSketchAndProps struct{} func (s *ContainerSetupHardwareToolsLibsSketchAndProps) Run(ctx *types.Context) error { sketchBuildPath, librariesBuildPath, coreBuildPath, - warningsLevel, librariesResolutionResults, err := AddAdditionalEntriesToContext(ctx.BuildPath, ctx.WarningsLevel) + warningsLevel, err := AddAdditionalEntriesToContext(ctx.BuildPath, ctx.WarningsLevel) if err != nil { return errors.WithStack(err) } @@ -32,7 +32,6 @@ func (s *ContainerSetupHardwareToolsLibsSketchAndProps) Run(ctx *types.Context) ctx.LibrariesBuildPath = librariesBuildPath ctx.CoreBuildPath = coreBuildPath ctx.WarningsLevel = warningsLevel - ctx.LibrariesResolutionResults = librariesResolutionResults commands := []types.Command{ &FailIfBuildPathEqualsSketchPath{}, From 67de6673efbfc998c3d7415a5e5fc9fdec6541bb Mon Sep 17 00:00:00 2001 From: Alessio Perugini Date: Thu, 31 Aug 2023 17:35:51 +0200 Subject: [PATCH 4/6] rename bPath to buildPath --- legacy/builder/add_additional_entries_to_context.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/legacy/builder/add_additional_entries_to_context.go b/legacy/builder/add_additional_entries_to_context.go index ce98ff4dab6..e33b8f93f9e 100644 --- a/legacy/builder/add_additional_entries_to_context.go +++ b/legacy/builder/add_additional_entries_to_context.go @@ -26,16 +26,16 @@ func AddAdditionalEntriesToContext(buildPath *paths.Path, warningLevel string) ( var err error if buildPath != nil { - bPath := buildPath - sketchBuildPath, err = bPath.Join(constants.FOLDER_SKETCH).Abs() + buildPath := buildPath + sketchBuildPath, err = buildPath.Join(constants.FOLDER_SKETCH).Abs() if err != nil { return nil, nil, nil, "", errors.WithStack(err) } - librariesBuildPath, err = bPath.Join(constants.FOLDER_LIBRARIES).Abs() + librariesBuildPath, err = buildPath.Join(constants.FOLDER_LIBRARIES).Abs() if err != nil { return nil, nil, nil, "", errors.WithStack(err) } - coreBuildPath, err = bPath.Join(constants.FOLDER_CORE).Abs() + coreBuildPath, err = buildPath.Join(constants.FOLDER_CORE).Abs() if err != nil { return nil, nil, nil, "", errors.WithStack(err) } From d64698872a0d49977ae46ba4061bc43ae5d6c4fe Mon Sep 17 00:00:00 2001 From: Alessio Perugini Date: Thu, 31 Aug 2023 17:39:29 +0200 Subject: [PATCH 5/6] cleanup usless tests --- .../add_additional_entries_to_context_test.go | 8 ++--- legacy/builder/test/hardware_loader_test.go | 10 ------ legacy/builder/test/libraries_loader_test.go | 36 ------------------- legacy/builder/test/recipe_runner_test.go | 9 ----- .../test/setup_build_properties_test.go | 18 ---------- 5 files changed, 2 insertions(+), 79 deletions(-) diff --git a/legacy/builder/test/add_additional_entries_to_context_test.go b/legacy/builder/test/add_additional_entries_to_context_test.go index e39cc2a4984..dc15e16697c 100644 --- a/legacy/builder/test/add_additional_entries_to_context_test.go +++ b/legacy/builder/test/add_additional_entries_to_context_test.go @@ -29,7 +29,7 @@ func TestAddAdditionalEntriesToContextNoBuildPath(t *testing.T) { ctx := &types.Context{} sketchBuildPath, librariesBuildPath, coreBuildPath, - warningsLevel, librariesResolutionResults, err := builder.AddAdditionalEntriesToContext(ctx.BuildPath, ctx.WarningsLevel) + warningsLevel, err := builder.AddAdditionalEntriesToContext(ctx.BuildPath, ctx.WarningsLevel) NoError(t, err) require.Empty(t, sketchBuildPath) @@ -37,8 +37,6 @@ func TestAddAdditionalEntriesToContextNoBuildPath(t *testing.T) { require.Empty(t, coreBuildPath) require.NotNil(t, warningsLevel) - - require.Equal(t, 0, len(librariesResolutionResults)) } func TestAddAdditionalEntriesToContextWithBuildPath(t *testing.T) { @@ -46,7 +44,7 @@ func TestAddAdditionalEntriesToContextWithBuildPath(t *testing.T) { ctx.BuildPath = paths.New("folder") sketchBuildPath, librariesBuildPath, coreBuildPath, - warningsLevel, librariesResolutionResults, err := builder.AddAdditionalEntriesToContext(ctx.BuildPath, ctx.WarningsLevel) + warningsLevel, err := builder.AddAdditionalEntriesToContext(ctx.BuildPath, ctx.WarningsLevel) NoError(t, err) require.Equal(t, Abs(t, paths.New("folder", constants.FOLDER_SKETCH)), sketchBuildPath) @@ -54,6 +52,4 @@ func TestAddAdditionalEntriesToContextWithBuildPath(t *testing.T) { require.Equal(t, Abs(t, paths.New("folder", constants.FOLDER_CORE)), coreBuildPath) require.NotNil(t, warningsLevel) - - require.Equal(t, 0, len(librariesResolutionResults)) } diff --git a/legacy/builder/test/hardware_loader_test.go b/legacy/builder/test/hardware_loader_test.go index 120ceb2148c..c7e4b0ba387 100644 --- a/legacy/builder/test/hardware_loader_test.go +++ b/legacy/builder/test/hardware_loader_test.go @@ -20,7 +20,6 @@ import ( "runtime" "testing" - "github.com/arduino/arduino-cli/legacy/builder" "github.com/arduino/arduino-cli/legacy/builder/types" paths "github.com/arduino/go-paths-helper" "github.com/stretchr/testify/require" @@ -69,15 +68,6 @@ func TestLoadHardwareMixingUserHardwareFolder(t *testing.T) { ctx = prepareBuilderTestContext(t, ctx, nil, "") defer cleanUpBuilderTestContext(t, ctx) - sketchBuildPath, librariesBuildPath, coreBuildPath, - warningsLevel, librariesResolutionResults, err := builder.AddAdditionalEntriesToContext(ctx.BuildPath, ctx.WarningsLevel) - NoError(t, err) - ctx.SketchBuildPath = sketchBuildPath - ctx.LibrariesBuildPath = librariesBuildPath - ctx.CoreBuildPath = coreBuildPath - ctx.WarningsLevel = warningsLevel - ctx.LibrariesResolutionResults = librariesResolutionResults - packages := ctx.PackageManager.GetPackages() if runtime.GOOS == "windows" { diff --git a/legacy/builder/test/libraries_loader_test.go b/legacy/builder/test/libraries_loader_test.go index 180a5374c63..a18880fed92 100644 --- a/legacy/builder/test/libraries_loader_test.go +++ b/legacy/builder/test/libraries_loader_test.go @@ -47,15 +47,6 @@ func TestLoadLibrariesAVR(t *testing.T) { ctx = prepareBuilderTestContext(t, ctx, nil, "arduino:avr:leonardo") defer cleanUpBuilderTestContext(t, ctx) - sketchBuildPath, librariesBuildPath, coreBuildPath, - warningsLevel, librariesResolutionResults, err := builder.AddAdditionalEntriesToContext(ctx.BuildPath, ctx.WarningsLevel) - NoError(t, err) - ctx.SketchBuildPath = sketchBuildPath - ctx.LibrariesBuildPath = librariesBuildPath - ctx.CoreBuildPath = coreBuildPath - ctx.WarningsLevel = warningsLevel - ctx.LibrariesResolutionResults = librariesResolutionResults - commands := []types.Command{ &builder.LibrariesLoader{}, } @@ -161,15 +152,6 @@ func TestLoadLibrariesSAM(t *testing.T) { ctx = prepareBuilderTestContext(t, ctx, nil, "arduino:sam:arduino_due_x_dbg") defer cleanUpBuilderTestContext(t, ctx) - sketchBuildPath, librariesBuildPath, coreBuildPath, - warningsLevel, librariesResolutionResults, err := builder.AddAdditionalEntriesToContext(ctx.BuildPath, ctx.WarningsLevel) - NoError(t, err) - ctx.SketchBuildPath = sketchBuildPath - ctx.LibrariesBuildPath = librariesBuildPath - ctx.CoreBuildPath = coreBuildPath - ctx.WarningsLevel = warningsLevel - ctx.LibrariesResolutionResults = librariesResolutionResults - commands := []types.Command{ &builder.LibrariesLoader{}, } @@ -248,15 +230,6 @@ func TestLoadLibrariesAVRNoDuplicateLibrariesFolders(t *testing.T) { ctx = prepareBuilderTestContext(t, ctx, nil, "arduino:avr:leonardo") defer cleanUpBuilderTestContext(t, ctx) - sketchBuildPath, librariesBuildPath, coreBuildPath, - warningsLevel, librariesResolutionResults, err := builder.AddAdditionalEntriesToContext(ctx.BuildPath, ctx.WarningsLevel) - NoError(t, err) - ctx.SketchBuildPath = sketchBuildPath - ctx.LibrariesBuildPath = librariesBuildPath - ctx.CoreBuildPath = coreBuildPath - ctx.WarningsLevel = warningsLevel - ctx.LibrariesResolutionResults = librariesResolutionResults - commands := []types.Command{ &builder.LibrariesLoader{}, } @@ -281,15 +254,6 @@ func TestLoadLibrariesMyAVRPlatform(t *testing.T) { ctx = prepareBuilderTestContext(t, ctx, nil, "my_avr_platform:avr:custom_yun") defer cleanUpBuilderTestContext(t, ctx) - sketchBuildPath, librariesBuildPath, coreBuildPath, - warningsLevel, librariesResolutionResults, err := builder.AddAdditionalEntriesToContext(ctx.BuildPath, ctx.WarningsLevel) - NoError(t, err) - ctx.SketchBuildPath = sketchBuildPath - ctx.LibrariesBuildPath = librariesBuildPath - ctx.CoreBuildPath = coreBuildPath - ctx.WarningsLevel = warningsLevel - ctx.LibrariesResolutionResults = librariesResolutionResults - commands := []types.Command{ &builder.LibrariesLoader{}, } diff --git a/legacy/builder/test/recipe_runner_test.go b/legacy/builder/test/recipe_runner_test.go index ad21730ce1d..5d9a53ef68e 100644 --- a/legacy/builder/test/recipe_runner_test.go +++ b/legacy/builder/test/recipe_runner_test.go @@ -34,15 +34,6 @@ func TestRecipeRunner(t *testing.T) { buildProperties.Set("recipe.hooks.prebuild.1.pattern", "echo") - sketchBuildPath, librariesBuildPath, coreBuildPath, - warningsLevel, librariesResolutionResults, err := builder.AddAdditionalEntriesToContext(ctx.BuildPath, ctx.WarningsLevel) - NoError(t, err) - ctx.SketchBuildPath = sketchBuildPath - ctx.LibrariesBuildPath = librariesBuildPath - ctx.CoreBuildPath = coreBuildPath - ctx.WarningsLevel = warningsLevel - ctx.LibrariesResolutionResults = librariesResolutionResults - commands := []types.Command{ &builder.RecipeByPrefixSuffixRunner{Prefix: "recipe.hooks.prebuild", Suffix: ".pattern"}, } diff --git a/legacy/builder/test/setup_build_properties_test.go b/legacy/builder/test/setup_build_properties_test.go index 4d577da17b7..d26a217d398 100644 --- a/legacy/builder/test/setup_build_properties_test.go +++ b/legacy/builder/test/setup_build_properties_test.go @@ -34,15 +34,6 @@ func TestSetupBuildProperties(t *testing.T) { ctx = prepareBuilderTestContext(t, ctx, paths.New("sketch1", "sketch1.ino"), "arduino:avr:uno") defer cleanUpBuilderTestContext(t, ctx) - sketchBuildPath, librariesBuildPath, coreBuildPath, - warningsLevel, librariesResolutionResults, err := builder.AddAdditionalEntriesToContext(ctx.BuildPath, ctx.WarningsLevel) - NoError(t, err) - ctx.SketchBuildPath = sketchBuildPath - ctx.LibrariesBuildPath = librariesBuildPath - ctx.CoreBuildPath = coreBuildPath - ctx.WarningsLevel = warningsLevel - ctx.LibrariesResolutionResults = librariesResolutionResults - buildProperties := ctx.BuildProperties require.Equal(t, "ARDUINO", buildProperties.Get("software")) @@ -109,15 +100,6 @@ func TestSetupBuildPropertiesUserHardware(t *testing.T) { ctx = prepareBuilderTestContext(t, ctx, paths.New("sketch1", "sketch1.ino"), "my_avr_platform:avr:custom_yun") defer cleanUpBuilderTestContext(t, ctx) - sketchBuildPath, librariesBuildPath, coreBuildPath, - warningsLevel, librariesResolutionResults, err := builder.AddAdditionalEntriesToContext(ctx.BuildPath, ctx.WarningsLevel) - NoError(t, err) - ctx.SketchBuildPath = sketchBuildPath - ctx.LibrariesBuildPath = librariesBuildPath - ctx.CoreBuildPath = coreBuildPath - ctx.WarningsLevel = warningsLevel - ctx.LibrariesResolutionResults = librariesResolutionResults - buildProperties := ctx.BuildProperties require.Equal(t, "ARDUINO", buildProperties.Get("software")) From 9d986345e62c572c1811e0e9e4604bd6ed3e7372 Mon Sep 17 00:00:00 2001 From: Alessio Perugini Date: Thu, 31 Aug 2023 18:03:57 +0200 Subject: [PATCH 6/6] remove shadowed variable --- legacy/builder/add_additional_entries_to_context.go | 1 - 1 file changed, 1 deletion(-) diff --git a/legacy/builder/add_additional_entries_to_context.go b/legacy/builder/add_additional_entries_to_context.go index e33b8f93f9e..843cbdcd79e 100644 --- a/legacy/builder/add_additional_entries_to_context.go +++ b/legacy/builder/add_additional_entries_to_context.go @@ -26,7 +26,6 @@ func AddAdditionalEntriesToContext(buildPath *paths.Path, warningLevel string) ( var err error if buildPath != nil { - buildPath := buildPath sketchBuildPath, err = buildPath.Join(constants.FOLDER_SKETCH).Abs() if err != nil { return nil, nil, nil, "", errors.WithStack(err)