Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tools/projmgr/src/ProjMgr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1246,8 +1246,8 @@ bool ProjMgr::ValidateCreatedFor(const string& createdFor) {
if (VersionCmp::RangeCompare(version, currentVersion + ":" + currentVersion) <= 0) {
return true;
} else {
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";
const string msg = "'created-for' in file " + m_csolutionFile + " specifies a minimum version "
+ version + " (current version " + currentVersion + ")";
if (m_rpcMode) {
ProjMgrLogger::Get().Warn(msg);
return true;
Expand Down
4 changes: 2 additions & 2 deletions tools/projmgr/test/src/ProjMgrUnitTests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6175,8 +6175,8 @@ TEST_F(ProjMgrUnitTests, FailCreatedFor) {
char* argv[5];
StdStreamRedirect streamRedirect;
const string& csolution = testinput_folder + "/TestSolution/created-for.csolution.yml";
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";
const string& expectedErrMsg = "error csolution: 'created-for' in file .*created-for\\.csolution\\.yml\
specifies a minimum version 9\\.9\\.9 \\(current version .*\\)\n";
argv[1] = (char*)"convert";
argv[2] = (char*)csolution.c_str();
argv[3] = (char*)"--output";
Expand Down
Loading