Replace %Instance% with instance index in [email protected] files

libs/rtemodel/src/RteProject.cpp

@@ -676,7 +676,7 @@ void RteProject::UpdateConfigFileBackups(RteFileInstance* fi, RteFile* f)
     // create base file if possible
     if (baseVersion == updateVersion) {
       // we can use current version as base one
-      RteFsUtils::CopyCheckFile(src, baseFile, false);
+      RteFsUtils::CopyMergeFile(src, baseFile, fi->GetInstanceIndex(), false);
       RteFsUtils::SetFileReadOnly(baseFile, true);
     } else {
       baseFile.clear(); //no such file
@@ -685,7 +685,7 @@ void RteProject::UpdateConfigFileBackups(RteFileInstance* fi, RteFile* f)
   // copy current file if version differs
   string updateFile = RteUtils::AppendFileUpdateVersion(absPath, updateVersion);
   if (!baseFile.empty() && baseVersion != updateVersion)  { // only copy update if base exists
-    RteFsUtils::CopyCheckFile(src, updateFile, false);
+    RteFsUtils::CopyMergeFile(src, updateFile, fi->GetInstanceIndex(), false);
     RteFsUtils::SetFileReadOnly(updateFile, true);
   } else {
     updateFile.clear(); // no need in that

libs/rtemodel/test/src/RteModelTest.cpp

@@ -623,10 +623,24 @@ TEST_F(RteModelPrjTest, LoadCprjConfigVer) {
   ASSERT_NE(loadedCprjProject, nullptr);
 
   const string rteDir = RteUtils::ExtractFilePath(RteTestM3_cprj, true) + loadedCprjProject->GetRteFolder() + "/";
-  const string CompConfig_0_Base_Version = rteDir + "RteTest/" + "[email protected]";
-  const string CompConfig_1_Base_Version = rteDir + "RteTest/" + "[email protected]";
+  const string CompConfig_0 = rteDir + "RteTest/" + "ComponentLevelConfig_0.h";
+  const string CompConfig_0_Base_Version = CompConfig_0 + "[email protected]";
+  EXPECT_TRUE(RteFsUtils::Exists(CompConfig_0));
   EXPECT_TRUE(RteFsUtils::Exists(CompConfig_0_Base_Version));
+  const string CompConfig_1 = rteDir + "RteTest/" + "ComponentLevelConfig_1.h";
+  const string CompConfig_1_Base_Version = CompConfig_1 + "[email protected]";
+  EXPECT_TRUE(RteFsUtils::Exists(CompConfig_1));
   EXPECT_TRUE(RteFsUtils::Exists(CompConfig_1_Base_Version));
+  // check if freshly copied files match their base
+  // that also checks if base files expand %Instance% with correct instance
+  string buf, bufBase;
+  EXPECT_TRUE(RteFsUtils::ReadFile(CompConfig_0, buf));
+  EXPECT_TRUE(RteFsUtils::ReadFile(CompConfig_0_Base_Version, bufBase));
+  EXPECT_EQ(buf, bufBase);
+
+  EXPECT_TRUE(RteFsUtils::ReadFile(CompConfig_1, buf));
+  EXPECT_TRUE(RteFsUtils::ReadFile(CompConfig_1_Base_Version, bufBase));
+  EXPECT_EQ(buf, bufBase);
 
   const string deviceDir = rteDir + "Device/RteTest_ARMCM3/";
   EXPECT_TRUE(RteFsUtils::Exists(deviceDir + "ARMCM3_ac6.sct"));