Align failing lecacy tests with new hashing behaviour

Author: rsora

Diff for: legacy/builder/phases/core_builder.go

@@ -91,7 +91,7 @@ func compileCore(ctx *types.Context, buildPath *paths.Path, buildCachePath *path
 
 	var targetArchivedCore *paths.Path
 	if buildCachePath != nil {
-		archivedCoreName := getCachedCoreArchiveFileName(buildProperties.Get(constants.BUILD_PROPERTIES_FQBN),
+		archivedCoreName := GetCachedCoreArchiveFileName(buildProperties.Get(constants.BUILD_PROPERTIES_FQBN),
 			buildProperties.Get("compiler.optimization_flags"), realCoreFolder)
 		targetArchivedCore = buildCachePath.Join(archivedCoreName)
 		canUseArchivedCore := !builder_utils.CoreOrReferencedCoreHasChanged(realCoreFolder, targetCoreFolder, targetArchivedCore)
@@ -134,7 +134,7 @@ func compileCore(ctx *types.Context, buildPath *paths.Path, buildCachePath *path
 
 // GetCachedCoreArchiveFileName returns the filename to be used to store
 // the global cached core.a.
-func getCachedCoreArchiveFileName(fqbn string, optimizationFlags string, coreFolder *paths.Path) string {
+func GetCachedCoreArchiveFileName(fqbn string, optimizationFlags string, coreFolder *paths.Path) string {
 	fqbnToUnderscore := strings.Replace(fqbn, ":", "_", -1)
 	fqbnToUnderscore = strings.Replace(fqbnToUnderscore, "=", "_", -1)
 	if absCoreFolder, err := coreFolder.Abs(); err == nil {

Diff for: legacy/builder/test/builder_test.go

@@ -24,8 +24,8 @@ import (
 	"github.com/arduino/go-paths-helper"
 
 	"github.com/arduino/arduino-cli/legacy/builder"
-	"github.com/arduino/arduino-cli/legacy/builder/builder_utils"
 	"github.com/arduino/arduino-cli/legacy/builder/constants"
+	"github.com/arduino/arduino-cli/legacy/builder/phases"
 	"github.com/arduino/arduino-cli/legacy/builder/types"
 	"github.com/stretchr/testify/require"
 )
@@ -379,7 +379,7 @@ func TestBuilderCacheCoreAFile(t *testing.T) {
 
 	// Pick timestamp of cached core
 	coreFolder := paths.New("downloaded_hardware", "arduino", "avr")
-	coreFileName := builder_utils.GetCachedCoreArchiveFileName(ctx.FQBN.String(), coreFolder)
+	coreFileName := phases.GetCachedCoreArchiveFileName(ctx.FQBN.String(), ctx.OptimizationFlags, coreFolder)
 	cachedCoreFile := ctx.CoreBuildCachePath.Join(coreFileName)
 	coreStatBefore, err := cachedCoreFile.Stat()
 	require.NoError(t, err)

Diff for: legacy/builder/test/create_build_options_map_test.go

@@ -35,6 +35,7 @@ func TestCreateBuildOptionsMap(t *testing.T) {
 		Verbose:            true,
 		BuildPath:          paths.New("buildPath"),
 		DebugLevel:         5,
+		OptimizationFlags:  "-Os",
 	}
 
 	create := builder.CreateBuildOptionsMap{}
@@ -45,6 +46,7 @@ func TestCreateBuildOptionsMap(t *testing.T) {
   "additionalFiles": "",
   "builtInLibrariesFolders": "",
   "builtInToolsFolders": "tools",
+  "compiler.optimization_flags": "-Os",
   "customBuildProperties": "",
   "fqbn": "my:nice:fqbn",
   "hardwareFolders": "hardware,hardware2",

Diff for: legacy/builder/test/store_build_options_map_test.go

@@ -37,6 +37,7 @@ func TestStoreBuildOptionsMap(t *testing.T) {
 		CustomBuildProperties: []string{"custom=prop"},
 		Verbose:               true,
 		DebugLevel:            5,
+		OptimizationFlags:     "-Os",
 	}
 
 	buildPath := SetupBuildPath(t, ctx)
@@ -63,6 +64,7 @@ func TestStoreBuildOptionsMap(t *testing.T) {
   "additionalFiles": "",
   "builtInLibrariesFolders": "built-in libraries",
   "builtInToolsFolders": "tools",
+  "compiler.optimization_flags": "-Os",
   "customBuildProperties": "custom=prop",
   "fqbn": "my:nice:fqbn",
   "hardwareFolders": "hardware",