Commit 4683706

author

rsora

committed

Align failing lecacy tests with new hashing behaviour

1 parent deee049 commit 4683706Copy full SHA for 4683706

File tree

-4

lines changed

-4

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ func compileCore(ctx types.Context, buildPath paths.Path, buildCachePath *path`
`91`	`91`
`92`	`92`	`var targetArchivedCore *paths.Path`
`93`	`93`	`if buildCachePath != nil {`
`94`		`- archivedCoreName := getCachedCoreArchiveFileName(buildProperties.Get(constants.BUILD_PROPERTIES_FQBN),`
	`94`	`+ archivedCoreName := GetCachedCoreArchiveFileName(buildProperties.Get(constants.BUILD_PROPERTIES_FQBN),`
`95`	`95`	`buildProperties.Get("compiler.optimization_flags"), realCoreFolder)`
`96`	`96`	`targetArchivedCore = buildCachePath.Join(archivedCoreName)`
`97`	`97`	`canUseArchivedCore := !builder_utils.CoreOrReferencedCoreHasChanged(realCoreFolder, targetCoreFolder, targetArchivedCore)`
`@@ -134,7 +134,7 @@ func compileCore(ctx types.Context, buildPath paths.Path, buildCachePath *path`
`134`	`134`
`135`	`135`	`// GetCachedCoreArchiveFileName returns the filename to be used to store`
`136`	`136`	`// the global cached core.a.`
`137`		`-func getCachedCoreArchiveFileName(fqbn string, optimizationFlags string, coreFolder *paths.Path) string {`
	`137`	`+func GetCachedCoreArchiveFileName(fqbn string, optimizationFlags string, coreFolder *paths.Path) string {`
`138`	`138`	`fqbnToUnderscore := strings.Replace(fqbn, ":", "_", -1)`
`139`	`139`	`fqbnToUnderscore = strings.Replace(fqbnToUnderscore, "=", "_", -1)`
`140`	`140`	`if absCoreFolder, err := coreFolder.Abs(); err == nil {`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,8 +24,8 @@ import (`
`24`	`24`	`"github.com/arduino/go-paths-helper"`
`25`	`25`
`26`	`26`	`"github.com/arduino/arduino-cli/legacy/builder"`
`27`		`- "github.com/arduino/arduino-cli/legacy/builder/builder_utils"`
`28`	`27`	`"github.com/arduino/arduino-cli/legacy/builder/constants"`
	`28`	`+ "github.com/arduino/arduino-cli/legacy/builder/phases"`
`29`	`29`	`"github.com/arduino/arduino-cli/legacy/builder/types"`
`30`	`30`	`"github.com/stretchr/testify/require"`
`31`	`31`	`)`
`@@ -379,7 +379,7 @@ func TestBuilderCacheCoreAFile(t *testing.T) {`
`379`	`379`
`380`	`380`	`// Pick timestamp of cached core`
`381`	`381`	`coreFolder := paths.New("downloaded_hardware", "arduino", "avr")`
`382`		`- coreFileName := builder_utils.GetCachedCoreArchiveFileName(ctx.FQBN.String(), coreFolder)`
	`382`	`+ coreFileName := phases.GetCachedCoreArchiveFileName(ctx.FQBN.String(), ctx.OptimizationFlags, coreFolder)`
`383`	`383`	`cachedCoreFile := ctx.CoreBuildCachePath.Join(coreFileName)`
`384`	`384`	`coreStatBefore, err := cachedCoreFile.Stat()`
`385`	`385`	`require.NoError(t, err)`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@ func TestCreateBuildOptionsMap(t *testing.T) {`
`35`	`35`	`Verbose: true,`
`36`	`36`	`BuildPath: paths.New("buildPath"),`
`37`	`37`	`DebugLevel: 5,`
	`38`	`+ OptimizationFlags: "-Os",`
`38`	`39`	`}`
`39`	`40`
`40`	`41`	`create := builder.CreateBuildOptionsMap{}`
`@@ -45,6 +46,7 @@ func TestCreateBuildOptionsMap(t *testing.T) {`
`45`	`46`	`"additionalFiles": "",`
`46`	`47`	`"builtInLibrariesFolders": "",`
`47`	`48`	`"builtInToolsFolders": "tools",`
	`49`	`+ "compiler.optimization_flags": "-Os",`
`48`	`50`	`"customBuildProperties": "",`
`49`	`51`	`"fqbn": "my:nice:fqbn",`
`50`	`52`	`"hardwareFolders": "hardware,hardware2",`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@ func TestStoreBuildOptionsMap(t *testing.T) {`
`37`	`37`	`CustomBuildProperties: []string{"custom=prop"},`
`38`	`38`	`Verbose: true,`
`39`	`39`	`DebugLevel: 5,`
	`40`	`+ OptimizationFlags: "-Os",`
`40`	`41`	`}`
`41`	`42`
`42`	`43`	`buildPath := SetupBuildPath(t, ctx)`
`@@ -63,6 +64,7 @@ func TestStoreBuildOptionsMap(t *testing.T) {`
`63`	`64`	`"additionalFiles": "",`
`64`	`65`	`"builtInLibrariesFolders": "built-in libraries",`
`65`	`66`	`"builtInToolsFolders": "tools",`
	`67`	`+ "compiler.optimization_flags": "-Os",`
`66`	`68`	`"customBuildProperties": "custom=prop",`
`67`	`69`	`"fqbn": "my:nice:fqbn",`
`68`	`70`	`"hardwareFolders": "hardware",`

Comments

(0)