[rtefsutils] Ensure canonical directory separator

Author: brondani

libs/rtefsutils/src/RteFsUtils.cpp

@@ -31,7 +31,7 @@ using namespace std;
 string RteFsUtils::MakePathCanonical(const string& path)
 {
   error_code ec;
-  string canonical = fs::weakly_canonical(path, ec).generic_string();
+  string canonical = fs::weakly_canonical(RteUtils::BackSlashesToSlashes(path), ec).generic_string();
   if (ec) {
     // canonical call failed, e.g. path does not exist
     return path;

libs/rtefsutils/test/src/RteFsUtilsTest.cpp

@@ -47,6 +47,12 @@ const string filenameBackup0 = RteUtils::SlashesToOsSlashes(filenameRegular + ".
 const string filenameBackup1 = RteUtils::SlashesToOsSlashes(filenameRegular + ".0001");
 const string pathInvalid = dirnameSubdir + "/Invalid";
 
+// For Canonical Tests
+const string filenameBackslashForCanonical = dirnameSubdirBackslash + "\\file.txt";
+const string dirnameSubdirBackslashForCanonical = dirnameBase + "\\dir\\subdir";
+const string dirnameMixedWithTrailingForCanonical = dirnameBase + "/dir\\subdir/";
+const string dirnameBackslashWithTrailingForCanonical = dirnameBase + "\\dir\\subdir\\";
+
 static set<string, VersionCmp::Greater> sortedFileSet = {
   "foo.h",
   "bar.h",
@@ -849,23 +855,23 @@ TEST_F(RteFsUtilsTest, MakePathCanonical) {
   EXPECT_EQ(ret, nonExistingFileAbs);
 
   // Test filename with backslashes separators
-  ret = RteFsUtils::MakePathCanonical(filenameBackslash);
+  ret = RteFsUtils::MakePathCanonical(filenameBackslashForCanonical);
   EXPECT_EQ(ret, filenameCanonical);
 
   // Test filename with mixed separators
-  ret = RteFsUtils::MakePathCanonical(filenameBackslash);
+  ret = RteFsUtils::MakePathCanonical(filenameBackslashForCanonical);
   EXPECT_EQ(ret, filenameCanonical);
 
   // Test dirname with regular separators and trailing
   ret = RteFsUtils::MakePathCanonical(dirnameSubdirWithTrailing);
   EXPECT_EQ(ret, dirnameCanonical);
 
   // Test dirname with backslashes separators and trailing
-  ret = RteFsUtils::MakePathCanonical(dirnameBackslashWithTrailing);
+  ret = RteFsUtils::MakePathCanonical(dirnameBackslashWithTrailingForCanonical);
   EXPECT_EQ(ret, dirnameCanonical);
 
   // Test dirname with mixed separators and trailing
-  ret = RteFsUtils::MakePathCanonical(dirnameMixedWithTrailing);
+  ret = RteFsUtils::MakePathCanonical(dirnameMixedWithTrailingForCanonical);
   EXPECT_EQ(ret, dirnameCanonical);
 
   // Test path with dot inside

tools/projmgr/src/ProjMgrYamlEmitter.cpp

@@ -806,7 +806,7 @@ void ProjMgrYamlCbuild::SetLicenseInfoNode(YAML::Node node, const ContextItem* c
       SetNodeValue(licNode[YAML_LICENSE], RteLicenseInfo::ConstructLicenseTitle(licInfo));
       const string& license_agreement = licInfo->GetAttribute("agreement");
       if (!license_agreement.empty()) {
-        SetNodeValue(licNode[YAML_LICENSE_AGREEMENT], license_agreement);
+        SetNodeValue(licNode[YAML_LICENSE_AGREEMENT], FormatPath(license_agreement, context->directories.cbuild));
       }
       YAML::Node packsNode = licNode[YAML_PACKS];
       for (auto pack : licInfo->GetPackIDs()) {

tools/projmgr/test/src/ProjMgrUtilsUnitTests.cpp

@@ -495,6 +495,7 @@ TEST_F(ProjMgrUtilsUnitTests, FormatPath) {
   vector<pair<string, string>> testData = {
     { "OriginalPath"                      , testoutput_folder + "/OriginalPath"     },
     { "${CMSIS_PACK_ROOT}/Pack"           , testcmsispack_folder + "/Pack"          },
+    { "${CMSIS_PACK_ROOT}/Backslash"      , testcmsispack_folder + "\\Backslash"    },
     { "${CMSIS_COMPILER_ROOT}/Toolchain"  , testcmsiscompiler_folder + "/Toolchain" },
     { "https://www.url.com"               , "https://www.url.com"                   },
   };