Improved error message, show Vendor name

Author: spcaipers-arm

tools/projmgr/src/ProjMgrWorker.cpp

@@ -1327,8 +1327,10 @@ bool ProjMgrWorker::ProcessDevice(ContextItem& context) {
       }
     }
     if (!matchedDevice) {
-      string msg = "specified device '" + deviceItem.name + "' was not found among the installed packs.";
-      msg += "\nuse \'cpackget\' utility to install software packs.\n  cpackget add Vendor.PackName --pack-root ./Path/Packs";
+      string msg = "specified device '" +
+        (deviceItem.vendor.empty() ? "" : deviceItem.vendor + "::") + deviceItem.name +
+        "' was not found among the installed packs.";
+      msg += "\nuse \'cpackget\' utility to install software packs.";
       ProjMgrLogger::Get().Error(msg, context.name);
       return false;
     }

tools/projmgr/test/data/TestSolution/PackMissing/ref/missing_pack.cbuild-idx.yml

@@ -12,7 +12,7 @@ build-idx:
       messages:
         errors:
           - "required pack: ARM::[email protected] not installed"
-          - "specified device 'RteTest_ARMCM0' was not found among the installed packs.\nuse 'cpackget' utility to install software packs.\n  cpackget add Vendor.PackName --pack-root ./Path/Packs"
+          - "specified device 'RteTest_ARMCM0' was not found among the installed packs.\nuse 'cpackget' utility to install software packs."
           - processing context 'project+CM0' failed
         info:
           - missing_pack.cbuild-pack.yml - file skipped
@@ -26,7 +26,7 @@ build-idx:
       messages:
         errors:
           - "required pack: ARM::[email protected] not installed"
-          - "specified device 'RteTest_ARMCM3' was not found among the installed packs.\nuse 'cpackget' utility to install software packs.\n  cpackget add Vendor.PackName --pack-root ./Path/Packs"
+          - "specified device 'RteTest_ARMCM3' was not found among the installed packs.\nuse 'cpackget' utility to install software packs."
           - processing context 'project+Gen' failed
         info:
           - missing_pack.cbuild-pack.yml - file skipped

tools/projmgr/test/data/TestSolution/PackMissing/ref/missing_pack_specific_context.cbuild-idx.yml

@@ -12,7 +12,7 @@ build-idx:
       messages:
         errors:
           - "required pack: ARM::[email protected] not installed"
-          - "specified device 'RteTest_ARMCM0' was not found among the installed packs.\nuse 'cpackget' utility to install software packs.\n  cpackget add Vendor.PackName --pack-root ./Path/Packs"
+          - "specified device 'RteTest_ARMCM0' was not found among the installed packs.\nuse 'cpackget' utility to install software packs."
           - processing context 'project+CM0' failed
         info:
           - missing_pack.cbuild-pack.yml - file skipped

tools/projmgr/test/src/ProjMgrUnitTests.cpp

@@ -2896,8 +2896,7 @@ TEST_F(ProjMgrUnitTests, RunProjMgr_Device_Unknown) {
   char* argv[7];
   string csolutionFile = UpdateTestSolutionFile("./TestProject4/test_device_unknown.cproject.yml");
   const string& expectedErrStr = R"(error csolution: specified device 'RteTest_ARM_UNKNOWN' was not found among the installed packs.
-use 'cpackget' utility to install software packs.
-  cpackget add Vendor.PackName --pack-root ./Path/Packs)";
+use 'cpackget' utility to install software packs.)";
   StdStreamRedirect streamRedirect;
 
   argv[1] = (char*)"convert";
@@ -2915,9 +2914,8 @@ TEST_F(ProjMgrUnitTests, RunProjMgr_Device_Unknown_Vendor) {
   // Test project with unknown device vendor
   char* argv[7];
   string csolutionFile = UpdateTestSolutionFile("./TestProject4/test_device_unknown_vendor.cproject.yml");
-  const string& expectedErrStr = R"(error csolution: specified device 'RteTest_ARMCM0' was not found among the installed packs.
-use 'cpackget' utility to install software packs.
-  cpackget add Vendor.PackName --pack-root ./Path/Packs)";
+  const string& expectedErrStr = R"(error csolution: specified device 'TEST::RteTest_ARMCM0' was not found among the installed packs.
+use 'cpackget' utility to install software packs.)";
   StdStreamRedirect streamRedirect;
 
   argv[1] = (char*)"convert";
@@ -2954,8 +2952,7 @@ TEST_F(ProjMgrUnitTests, RunProjMgr_Device_Unavailable_In_Board) {
   char* argv[7];
   string csolutionFile = UpdateTestSolutionFile("./TestProject4/test_device_unavailable_in_board.cproject.yml");
   const string& expectedErrStr = R"(error csolution: specified device 'RteTest_ARMCM7' was not found among the installed packs.
-use 'cpackget' utility to install software packs.
-  cpackget add Vendor.PackName --pack-root ./Path/Packs)";
+use 'cpackget' utility to install software packs.)";
   StdStreamRedirect streamRedirect;
 
   argv[1] = (char*)"convert";
@@ -3021,9 +3018,8 @@ TEST_F(ProjMgrUnitTests, RunProjMgr_Correct_Board_Wrong_Device_Info) {
   // Test project with correct board info but wrong device info
   char* argv[7];
   string csolutionFile = UpdateTestSolutionFile("./TestProject4/test_correct_board_wrong_device.cproject.yml");
-  const string& expectedErrStr = R"(error csolution: specified device 'RteTest_ARMCM_Unknown' was not found among the installed packs.
-use 'cpackget' utility to install software packs.
-  cpackget add Vendor.PackName --pack-root ./Path/Packs)";
+  const string& expectedErrStr = R"(error csolution: specified device 'ARM::RteTest_ARMCM_Unknown' was not found among the installed packs.
+use 'cpackget' utility to install software packs.)";
   StdStreamRedirect streamRedirect;
 
   argv[1] = (char*)"convert";

tools/projmgr/test/src/ProjMgrWorkerUnitTests.cpp

@@ -675,8 +675,7 @@ TEST_F(ProjMgrWorkerUnitTests, ProcessDevice_Invalid_Device_Name) {
   ContextDesc descriptor;
   const string& filename = testinput_folder + "/TestSolution/TestProject4/test_device_unknown.cproject.yml";
   const string& expectedErrStr = R"(error csolution: specified device 'RteTest_ARM_UNKNOWN' was not found among the installed packs.
-use 'cpackget' utility to install software packs.
-  cpackget add Vendor.PackName --pack-root ./Path/Packs)";
+use 'cpackget' utility to install software packs.)";
   StdStreamRedirect streamRedirect;
 
   EXPECT_TRUE(parser.ParseCproject(filename, true));
@@ -696,9 +695,8 @@ TEST_F(ProjMgrWorkerUnitTests, ProcessDevice_Invalid_Device_Vendor) {
   ContextDesc descriptor;
   const string& filename = testinput_folder +
     "/TestSolution/TestProject4/test_device_unknown_vendor.cproject.yml";
-  const string& expectedErrStr = R"(error csolution: specified device 'RteTest_ARMCM0' was not found among the installed packs.
-use 'cpackget' utility to install software packs.
-  cpackget add Vendor.PackName --pack-root ./Path/Packs)";
+  const string& expectedErrStr = R"(error csolution: specified device 'TEST::RteTest_ARMCM0' was not found among the installed packs.
+use 'cpackget' utility to install software packs.)";
   StdStreamRedirect streamRedirect;
 
   EXPECT_TRUE(parser.ParseCproject(filename, true));