Switched to AVR core 1.6.8

Added mechanism for upgrading cores used for testing

Signed-off-by: Federico Fissore <[email protected]>

Author: Federico Fissore

Diff for: src/arduino.cc/builder/test/helper_tools_downloader.go

@@ -32,6 +32,7 @@ package test
 import (
 	"arduino.cc/builder/constants"
 	"arduino.cc/builder/gohasissues"
+	"arduino.cc/builder/props"
 	"arduino.cc/builder/utils"
 	"encoding/json"
 	"fmt"
@@ -80,7 +81,7 @@ type Core struct {
 
 func DownloadCoresAndToolsAndLibraries(t *testing.T) {
 	cores := []Core{
-		Core{Maintainer: "arduino", Arch: "avr", Version: "1.6.7"},
+		Core{Maintainer: "arduino", Arch: "avr", Version: "1.6.8"},
 		Core{Maintainer: "arduino", Arch: "sam", Version: "1.6.4"},
 	}
 
@@ -151,7 +152,9 @@ func patch(t *testing.T) {
 }
 
 func download(t *testing.T, cores, boardsManagerCores, boardsManagerRedBearCores []Core, tools, boardsManagerTools, boardsManagerRFduinoTools []Tool, libraries []Library) {
-	if allCoresAlreadyDownloadedAndUnpacked(HARDWARE_FOLDER, cores) &&
+	allCoresDownloaded, err := allCoresAlreadyDownloadedAndUnpacked(HARDWARE_FOLDER, cores)
+	NoError(t, err)
+	if allCoresDownloaded &&
 		allBoardsManagerCoresAlreadyDownloadedAndUnpacked(BOARD_MANAGER_FOLDER, boardsManagerCores) &&
 		allBoardsManagerCoresAlreadyDownloadedAndUnpacked(BOARD_MANAGER_FOLDER, boardsManagerRedBearCores) &&
 		allBoardsManagerToolsAlreadyDownloadedAndUnpacked(BOARD_MANAGER_FOLDER, boardsManagerTools) &&
@@ -310,18 +313,37 @@ func boardManagerCoreAlreadyDownloadedAndUnpacked(targetPath string, core Core)
 	return !os.IsNotExist(err)
 }
 
-func allCoresAlreadyDownloadedAndUnpacked(targetPath string, cores []Core) bool {
+func allCoresAlreadyDownloadedAndUnpacked(targetPath string, cores []Core) (bool, error) {
 	for _, core := range cores {
-		if !coreAlreadyDownloadedAndUnpacked(targetPath, core) {
-			return false
+		alreadyDownloaded, err := coreAlreadyDownloadedAndUnpacked(targetPath, core)
+		if err != nil {
+			return false, utils.WrapError(err)
+		}
+		if !alreadyDownloaded {
+			return false, nil
 		}
 	}
-	return true
+	return true, nil
 }
 
-func coreAlreadyDownloadedAndUnpacked(targetPath string, core Core) bool {
-	_, err := os.Stat(filepath.Join(targetPath, core.Maintainer, core.Arch))
-	return !os.IsNotExist(err)
+func coreAlreadyDownloadedAndUnpacked(targetPath string, core Core) (bool, error) {
+	corePath := filepath.Join(targetPath, core.Maintainer, core.Arch)
+
+	_, err := os.Stat(corePath)
+	if os.IsNotExist(err) {
+		return false, nil
+	}
+	platform, err := props.Load(filepath.Join(corePath, "platform.txt"))
+	if err != nil {
+		return false, utils.WrapError(err)
+	}
+
+	if core.Version != platform["version"] {
+		err := os.RemoveAll(corePath)
+		return false, utils.WrapError(err)
+	}
+
+	return true, nil
 }
 
 func allBoardsManagerToolsAlreadyDownloadedAndUnpacked(targetPath string, tools []Tool) bool {
@@ -367,11 +389,15 @@ func libraryAlreadyDownloadedAndUnpacked(targetPath string, library Library) boo
 }
 
 func downloadAndUnpackCore(core Core, url string, targetPath string) error {
-	if coreAlreadyDownloadedAndUnpacked(targetPath, core) {
+	alreadyDownloaded, err := coreAlreadyDownloadedAndUnpacked(targetPath, core)
+	if err != nil {
+		return utils.WrapError(err)
+	}
+	if alreadyDownloaded {
 		return nil
 	}
 
-	targetPath, err := filepath.Abs(targetPath)
+	targetPath, err = filepath.Abs(targetPath)
 	if err != nil {
 		return utils.WrapError(err)
 	}

Diff for: src/arduino.cc/builder/test/setup_build_properties_test.go

@@ -75,7 +75,7 @@ func TestSetupBuildProperties(t *testing.T) {
 	require.Equal(t, "ARDUINO", buildProperties[constants.BUILD_PROPERTIES_SOFTWARE])
 
 	require.Equal(t, "uno", buildProperties[constants.ID])
-	require.Equal(t, "Arduino Uno", buildProperties["name"])
+	require.Equal(t, "Arduino/Genuino Uno", buildProperties["name"])
 	require.Equal(t, "0x2341", buildProperties["vid.0"])
 	require.Equal(t, "\"{compiler.path}{compiler.c.cmd}\" {compiler.c.flags} -mmcu={build.mcu} -DF_CPU={build.f_cpu} -DARDUINO={runtime.ide.version} -DARDUINO_{build.board} -DARDUINO_ARCH_{build.arch} {compiler.c.extra_flags} {build.extra_flags} {includes} \"{source_file}\" -o \"{object_file}\"", buildProperties["recipe.c.o.pattern"])
 	require.Equal(t, "{path}/etc/avrdude.conf", buildProperties["tools.avrdude.config.path"])