[projmgr] Rework created-for validation message

Author: grasci-arm

tools/projmgr/include/ProjMgr.h

@@ -197,6 +197,7 @@ class ProjMgr {
   bool m_frozenPacks;
   bool m_cbuildgen;
   bool m_updateIdx;
+  bool m_rpcMode = false;
   GroupNode m_files;
   std::vector<ContextItem*> m_processedContexts;
   std::vector<ContextItem*> m_allContexts;

tools/projmgr/src/ProjMgr.cpp

@@ -441,6 +441,7 @@ int ProjMgr::ProcessCommands() {
   } else if (m_command == "rpc") {
     // Launch 'rpc' server over stdin/stdout
     ProjMgrLogger::m_silent = true;
+    m_rpcMode = true;
     m_worker.RpcMode(true);
     if (!m_rpcServer.Run()) {
       return ErrorCode::ERROR;
@@ -1241,12 +1242,18 @@ bool ProjMgr::ValidateCreatedFor(const string& createdFor) {
         if (currentVersion.empty()) {
           return true;
         }
-        currentVersion += (":" + currentVersion);
-        if (VersionCmp::RangeCompare(version, currentVersion) <= 0) {
+        if (VersionCmp::RangeCompare(version, currentVersion + ":" + currentVersion) <= 0) {
           return true;
         } else {
-          ProjMgrLogger::Get().Error("solution requires newer CMSIS-Toolbox version " + version, "", m_csolutionFile);
-          return false;
+          const string msg = "the 'created-for' node in file " + m_csolutionFile + " specifies a minimum version "
+            + version + " which is higher than " + currentVersion + " of the used CMSIS-Toolbox manifest";
+          if (m_rpcMode) {
+            ProjMgrLogger::Get().Warn(msg);
+            return true;
+          } else {
+            ProjMgrLogger::Get().Error(msg);
+            return false;
+          }
         }
       }
     }

tools/projmgr/test/src/ProjMgrUnitTests.cpp

@@ -6141,15 +6141,17 @@ TEST_F(ProjMgrUnitTests, TestRestrictedContextsWithContextSet_Pass) {
 }
 
 TEST_F(ProjMgrUnitTests, ValidateCreatedFor) {
-  const vector<tuple<string, string, bool>> testData = {
-    { "[email protected]", "error"  , false },
-    { "[email protected]", "warning", true  },
-    { "[email protected]", ""       , true  },
-    { ""                   , ""       , true  },
-    { "Unknown"            , "warning", true  },
+  const vector<tuple<string, bool, string, bool>> testData = {
+    { "[email protected]", true , "warning", true  },
+    { "[email protected]", false, "error"  , false },
+    { "[email protected]", false, "warning", true  },
+    { "[email protected]", false, ""       , true  },
+    { ""                   , false, ""       , true  },
+    { "Unknown"            , false, "warning", true  },
   };
   StdStreamRedirect streamRedirect;
-  for (const auto& [createdFor, expectedMsg, expectedReturn] : testData) {
+  for (const auto& [createdFor, rpcMode, expectedMsg, expectedReturn] : testData) {
+    m_rpcMode = rpcMode;
     streamRedirect.ClearStringStreams();
     EXPECT_EQ(expectedReturn, ValidateCreatedFor(createdFor));
     auto errMsg = streamRedirect.GetErrorString();
@@ -6165,14 +6167,15 @@ TEST_F(ProjMgrUnitTests, FailCreatedFor) {
   char* argv[5];
   StdStreamRedirect streamRedirect;
   const string& csolution = testinput_folder + "/TestSolution/created-for.csolution.yml";
-  const string& expectedErrMsg = "error csolution: solution requires newer CMSIS-Toolbox version 9.9.9";
+  const string& expectedErrMsg = "error csolution: the 'created-for' node in file .*created-for\\.csolution\\.yml\
+ specifies a minimum version 9\\.9\\.9 which is higher than .* of the used CMSIS-Toolbox manifest\n";
   argv[1] = (char*)"convert";
   argv[2] = (char*)csolution.c_str();
   argv[3] = (char*)"--output";
   argv[4] = (char*)testoutput_folder.c_str();
   EXPECT_EQ(1, RunProjMgr(5, argv, 0));
   auto errMsg = streamRedirect.GetErrorString();
-  EXPECT_NE(string::npos, errMsg.find(expectedErrMsg));
+  EXPECT_TRUE(regex_match(errMsg, regex(expectedErrMsg)));
 }
 
 TEST_F(ProjMgrUnitTests, RunProjMgr_FailedConvertShouldCreateRteDirInProjectFolder) {