Fixed checks for mounted / compatible device (#1152)

* Fixed checks for mounted / compatible device

* Fixed checks

- check for wildcards in Dname: *?[]
- check for include paths on category="header"

Author: thorstendb-ARM

tools/packchk/src/PackChk_Msgs.cpp

@@ -132,7 +132,7 @@ const MsgTable PackChk::msgTable = {
   { "M316", { MsgLevel::LEVEL_WARNING,  CRLF_B, "URL must end with slash '/': '%URL%'" } },
   { "M317", { MsgLevel::LEVEL_WARNING,  CRLF_B, "Condition '%NAME%': No component found for '%NAME2%'" } },
   { "M318", { MsgLevel::LEVEL_WARNING,  CRLF_B, "Attribute '%TAG%' must not have '%TAG2%'" } },
-  { "M319", { MsgLevel::LEVEL_ERROR,    CRLF_B, "'%TAG%' already defined for '%TAG2%'" } },
+  { "M319", { MsgLevel::LEVEL_ERROR,    CRLF_B, "'%TAG%': '%NAME%' already defined for '%TAG2%': '%NAME2%', see Line %LINE%" } },
   { "M320", { MsgLevel::LEVEL_ERROR,    CRLF_B, "" } },
   { "M321", { MsgLevel::LEVEL_ERROR,    CRLF_B, "DS5 project requires '.project' file." } },
   { "M322", { MsgLevel::LEVEL_ERROR,    CRLF_B, "Associated File/Path not found: '%PATH%'" } },
@@ -239,7 +239,7 @@ const MsgTable PackChk::msgTable = {
   { "M604", { MsgLevel::LEVEL_WARNING,  CRLF_B, "Currently no Dcore feature check for '%NAME%'" } },
   { "M605", { MsgLevel::LEVEL_WARNING,  CRLF_B, "Required Dcore '%NAME%' feature '%NAME2%' not defined" } },
   { "M606", { MsgLevel::LEVEL_WARNING,  CRLF_B, "" } },
-  { "M607", { MsgLevel::LEVEL_WARNING,  CRLF_B, "" } },
+  { "M607", { MsgLevel::LEVEL_WARNING,  CRLF_B, "Tag '%TAG%' does not allow wildcard specification: '%NAME%'" } },
   { "M608", { MsgLevel::LEVEL_WARNING,  CRLF_B, "" } },
   { "M609", { MsgLevel::LEVEL_WARNING,  CRLF_B, "" } },
   { "M610", { MsgLevel::LEVEL_WARNING,  CRLF_B, "" } },

tools/packchk/src/ValidateSemantic.cpp

@@ -364,7 +364,7 @@ bool ValidateSemantic::UpdateRte(RteTarget* target, RteProject* rteProject, RteC
   RteComponentAggregate* cmsisComp = target->GetComponentAggregate("ARM::CMSIS.CORE");
   target->SelectComponent(cmsisComp, 1, true);
   target->SelectComponent(component, 1, true, true);
-  rteProject->CollectSettings();
+  rteProject->Apply();
   target->CollectFilteredFiles();
   target->EvaluateComponentDependencies();
 
@@ -740,6 +740,23 @@ bool ValidateSemantic::CheckDeviceDependencies(RteDeviceItem *device, RteProject
                     }
                   }
                 }
+
+                if(category == "header") {
+                  string fileName = RteUtils::BackSlashesToSlashes(RteUtils::ExtractFileName(file->GetName()));
+                  if(fileName.empty()) {
+                    continue;
+                  }
+                  const string& attribute = file->GetAttribute("attr");
+
+                  if(attribute == "config") {
+                    const string& fullFileName = targetPath + "/" + file->GetName();
+                    const string hPath = RteUtils::ExtractFilePath(fullFileName, false);
+                    const auto incPathFound = incPaths.find(hPath);
+                    if(incPathFound != incPaths.end()) {
+                      LogMsg("M357", NAME(file->GetName()), file->GetLineNumber());
+                    }
+                  }
+                }
               }
             }
 

tools/packchk/src/ValidateSyntax.cpp

@@ -1706,7 +1706,7 @@ bool ValidateSyntax::CheckBoards(RtePackage* pKg)
       auto foundDevIdxIt = mountedDeviceIndex.find(devIdx);
       if(foundDevIdxIt != mountedDeviceIndex.end()) {
         const RteItem* foundDev = foundDevIdxIt->second;
-        LogMsg("M319", TAG("deviceIndex"), TAG2(foundDev->GetDeviceName()));
+        LogMsg("M319", TAG("deviceIndex"), NAME(devIdx), TAG2("Dname"), NAME2(foundDev->GetDeviceName()), LINE(foundDev->GetLineNumber()), lineNo);
       }
       else {
         mountedDeviceIndex[devIdx] = mountedDevice;
@@ -1728,6 +1728,11 @@ bool ValidateSyntax::CheckBoards(RtePackage* pKg)
         continue;
       }
 
+      if(dname.find_first_of("*?[]") != string::npos) {
+        LogMsg("M607", TAG("Dname"), NAME(dname), lineNo);
+        continue;
+      }
+
       list<RteDevice*> devices;
       GetModel().GetDevices(devices, dname, dvendor);
       if(devices.empty()) {

tools/packchk/test/data/CheckBoardMountedCompatibleDevices/BulbBoard_BSP/Keil.BulbBoard_BSP.pdsc

@@ -41,6 +41,7 @@
       <mountedDevice    deviceIndex="3" Dvendor="Cypress:19"/>
       <mountedDevice    deviceIndex="0" Dvendor="Cypress:19" Dname="S6E1A12B0B"/>
       <mountedDevice    deviceIndex="2" Dvendor="Cypress:19" Dname="S6E1A12B0C"/>
+      <mountedDevice    deviceIndex="4" Dvendor="ARM:82" Dname="ARMCM*"/>
       <compatibleDevice deviceIndex="0" Dvendor="Cypress:19" Dname="S6E1A12C0A" Dfamily="Foo" DsubFamily="Bar"/>
       <compatibleDevice deviceIndex="0" Dvendor="Cypress:19" Dname="S6E1A11B0A"/>
       <compatibleDevice deviceIndex="0" Dvendor="Cypress:19" Dname="S6E1A11C0A"/>

tools/packchk/test/data/ConfigFileInIncludePath/Header/header1.h

@@ -0,0 +1 @@
+//header 1

tools/packchk/test/data/ConfigFileInIncludePath/Header/header2.h

@@ -0,0 +1 @@
+//header 1

tools/packchk/test/data/ConfigFileInIncludePath/TestVendor.ConfigFileInIncludePathPack.pdsc

@@ -59,6 +59,8 @@ The TestSubFamily is ...
       <files>
         <file category="include" name="Files/"/>
         <file category="source"  name="Files/header1.h" attr="config" version="1.0.0" condition="Test ARMCC"/>
+        <file category="header"  name="Header/header1.h" version="1.0.0" condition="Test ARMCC"/>
+        <file category="header"  name="Header/header2.h" attr="config" version="1.0.0" condition="Test ARMCC"/>
       </files>
     </component>
   </components>

tools/packchk/test/integtests/src/PackChkIntegTests.cpp

@@ -863,7 +863,7 @@ TEST_F(PackChkIntegTests, CheckConfigFileInIncludePath) {
     }
   }
 
-  if (!M357_foundCnt) {
+  if (M357_foundCnt != 2) {
     FAIL() << "error: missing message M357";
   }
 }
@@ -967,6 +967,7 @@ TEST_F(PackChkIntegTests, CheckBoardMountedCompatibleDevices) {
   int M318_foundCnt = 0;
   int M319_foundCnt = 0;
   int M346_foundCnt = 0;
+  int M607_foundCnt = 0;
   for (const string& msg : errMsgs) {
     size_t s;
     if ((s = msg.find("M308")) != string::npos) {
@@ -981,10 +982,13 @@ TEST_F(PackChkIntegTests, CheckBoardMountedCompatibleDevices) {
     if ((s = msg.find("M346")) != string::npos) {
       M346_foundCnt++;
     }
+    if ((s = msg.find("M607")) != string::npos) {
+      M607_foundCnt++;
+    }
   }
 
-  if (M308_foundCnt != 2 || M318_foundCnt != 2 || M319_foundCnt != 2 || M346_foundCnt != 3) {
-    FAIL() << "error: missing message M308, M318, M319, M346";
+  if (M308_foundCnt != 2 || M318_foundCnt != 2 || M319_foundCnt != 2 || M346_foundCnt != 3 || M607_foundCnt != 1) {
+    FAIL() << "error: missing message(s) on check mounted and compatible devices";
   }
 }