Fixed broken test in platform_keys_rewrite_loader_test. Also ensuring rewrites

are sorted as they are sorted in the text file

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

Author: Federico Fissore

Diff for: src/arduino.cc/builder/platform_keys_rewrite_loader.go

@@ -38,6 +38,7 @@ import (
 	"os"
 	"path/filepath"
 	"sort"
+	"strconv"
 	"strings"
 )
 
@@ -65,11 +66,16 @@ func (s *PlatformKeysRewriteLoader) Run(context map[string]interface{}) error {
 	for _, key := range keys {
 		keyParts := strings.Split(key, ".")
 		if keyParts[0] == constants.PLATFORM_REWRITE_OLD {
+			index, err := strconv.Atoi(keyParts[1])
+			if err != nil {
+				return utils.WrapError(err)
+			}
 			rewriteKey := strings.Join(keyParts[2:], ".")
 			oldValue := txt[key]
 			newValue := txt[constants.PLATFORM_REWRITE_NEW+"."+strings.Join(keyParts[1:], ".")]
 			platformKeyRewrite := types.PlatforKeyRewrite{Key: rewriteKey, OldValue: oldValue, NewValue: newValue}
-			platformKeysRewrite.Rewrites = append(platformKeysRewrite.Rewrites, platformKeyRewrite)
+			platformKeysRewrite.Rewrites = growSliceOfRewrites(platformKeysRewrite.Rewrites, index)
+			platformKeysRewrite.Rewrites[index] = platformKeyRewrite
 		}
 	}
 
@@ -92,3 +98,12 @@ func findPlatformKeysRewriteTxt(folders []string) (string, error) {
 
 	return constants.EMPTY_STRING, nil
 }
+
+func growSliceOfRewrites(originalSlice []types.PlatforKeyRewrite, maxIndex int) []types.PlatforKeyRewrite {
+	if cap(originalSlice) > maxIndex {
+		return originalSlice
+	}
+	newSlice := make([]types.PlatforKeyRewrite, maxIndex+1)
+	copy(newSlice, originalSlice)
+	return newSlice
+}

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

@@ -54,7 +54,7 @@ func TestLoadPlatformKeysRewrite(t *testing.T) {
 
 	platformKeysRewrite := context[constants.CTX_PLATFORM_KEYS_REWRITE].(types.PlatforKeysRewrite)
 
-	require.Equal(t, 10, len(platformKeysRewrite.Rewrites))
+	require.Equal(t, 12, len(platformKeysRewrite.Rewrites))
 	require.Equal(t, constants.BUILD_PROPERTIES_COMPILER_PATH, platformKeysRewrite.Rewrites[0].Key)
 	require.Equal(t, "{runtime.ide.path}/hardware/tools/avr/bin/", platformKeysRewrite.Rewrites[0].OldValue)
 	require.Equal(t, "{runtime.tools.avr-gcc.path}/bin/", platformKeysRewrite.Rewrites[0].NewValue)