Set Bname to empty string if not defined (#1351) (#2270)

* Set Bname empty in RteTarget ProcessAttributes

* Fix RPC tests

* Remove ambiguity in XmlItem::SetAttributes()

by making two XmlItem constructors explicit

* Make ubuntu C++ compiler happy

* Try to fix the tests

* Fix test data end test

* Change one overload of SetAttributes to CopyAttributes

To satisfy compiler.

Co-authored-by: Evgueni Driouk <[email protected]>

Author: grasci-arm

libs/rtemodel/include/RteInstance.h

@@ -428,7 +428,7 @@ class RteItemInstance : public RteItem
    * @param attr attributes to set as XmlItem reference
    * @return true if changed
   */
-  virtual bool SetPackageAttributes(const XmlItem& attr) { return m_packageAttributes.SetAttributes(attr); }
+  virtual bool SetPackageAttributes(const XmlItem& attr) { return m_packageAttributes.CopyAttributes(attr); }
 
   /**
    * @brief get pointer to resolved RtePackage
@@ -594,7 +594,7 @@ class RtePackageInstanceInfo : public RteItemInstance
    * @param attr pack attributes to set
    * @return true if attribute values have changed
   */
-   bool SetPackageAttributes(const XmlItem& attr) override { return SetAttributes(attr); }
+   bool SetPackageAttributes(const XmlItem& attr) override { return CopyAttributes(attr); }
 
   /**
    * @brief check if this object contains pack attributes directly rather than in a dedicated child
@@ -714,7 +714,7 @@ class RteGpdscInfo : public RteItemInstance
    * @param attr pack attributes
    * @return true if changed
   */
-   bool SetPackageAttributes(const XmlItem& attr) override { return SetAttributes(attr); }
+   bool SetPackageAttributes(const XmlItem& attr) override { return CopyAttributes(attr); }
 
   /**
    * @brief check if this object contains pack attributes directly rather than in a dedicated child

libs/rtemodel/include/RteModel.h

@@ -446,7 +446,7 @@ class RteModel : public RteItem
    * @param books collection of file path mapped to book title to fill
    * @param deviceAttributes device attributes
   */
-  void GetBoardBooks(std::map<std::string, std::string>& books, const std::map<std::string, std::string>& deviceAttributes) const;
+  void GetBoardBooks(std::map<std::string, std::string>& books, const XmlItem& deviceAttributes) const;
 
 public:
   /**

libs/rtemodel/src/RteInstance.cpp

@@ -157,9 +157,9 @@ void RteInstanceTargetInfo::CopySettings(const RteInstanceTargetInfo& other)
   SetVersionMatchMode(other.GetVersionMatchMode());
   SetExcluded(other.IsExcluded());
   SetIncludeInLib(other.IsIncludeInLib());
-  m_memOpt.SetAttributes(other.GetMemOpt());
-  m_cOpt.SetAttributes(other.GetCOpt());
-  m_asmOpt.SetAttributes(other.GetAsmOpt());
+  m_memOpt.CopyAttributes(other.GetMemOpt());
+  m_cOpt.CopyAttributes(other.GetCOpt());
+  m_asmOpt.CopyAttributes(other.GetAsmOpt());
 }
 
 
@@ -700,7 +700,7 @@ void RteFileInstance::Update(RteItem* f, bool bUpdateComponent)
     for (auto [targetName, ti] : m_targetInfos) {
       RteComponentInstance* ci = GetComponentInstance(targetName);
       if (ci) {
-        ci->SetAttributes(m_componentAttributes);
+        ci->CopyAttributes(m_componentAttributes);
         ci->SetPackageAttributes(m_packageAttributes);
       }
     }

libs/rtemodel/src/RteModel.cpp

@@ -800,13 +800,14 @@ void RteModel::GetBoardBooks(map<string, string>& books, const string& device, c
     return;
   XmlItem ea;
   d->GetEffectiveAttributes(ea);
-  GetBoardBooks(books, ea.GetAttributes());
+  GetBoardBooks(books, ea);
 }
 
-void RteModel::GetBoardBooks(map<string, string>& books, const map<string, string>& deviceAttributes) const
+void RteModel::GetBoardBooks(map<string, string>& books, const XmlItem& deviceAttributes) const
 {
-  if (m_boards.empty())
+  if(m_boards.empty()) {
     return;
+  }
   for (auto [_, b] : m_boards) {
     if (b->HasCompatibleDevice(deviceAttributes)) {
       b->GetBooks(books);

libs/rtemodel/src/RteProject.cpp

@@ -137,7 +137,7 @@ RteLicenseInfo* RteLicenseInfoCollection::EnsureLicenseInfo(RteItem* item, RteIt
     m_LicensInfos[licId] = info;
     string licFile;
     if (license) {
-      info->SetAttributes(*license);
+      info->CopyAttributes(*license);
       if(!info->HasAttribute("spdx")) {
         licFile = license->GetName();
       }
@@ -399,7 +399,7 @@ RteComponentInstance* RteProject::AddComponent(RteComponent* c, int instanceCoun
   if (c->IsGenerated() && c->HasAttribute("selectable") ) {
     RteItem* packInfo = c->GetFirstChild("package");
     if (packInfo) {
-      ci->SetPackageAttributes(packInfo->GetAttributes());
+      ci->SetPackageAttributes(*packInfo);
     }
   }
 
@@ -1460,18 +1460,18 @@ RteItem::ConditionResult RteProject::ResolveComponents(bool bFindReplacementForA
       }
 
       // first try to find a component from the same vendor
-      t->GetComponentAggregates(componentAttributes.GetAttributes(), aggregates);
+      t->GetComponentAggregates(componentAttributes, aggregates);
 
       // try to find a component from any vendor
       if (aggregates.empty()) {
         componentAttributes.RemoveAttribute("Cvendor");
-        t->GetComponentAggregates(componentAttributes.GetAttributes(), aggregates);
+        t->GetComponentAggregates(componentAttributes, aggregates);
       }
 
       // try to find a component with any variant
       if (aggregates.empty() && !componentAttributes.GetCvariantName().empty()) {
         componentAttributes.RemoveAttribute("Cvariant");
-        t->GetComponentAggregates(componentAttributes.GetAttributes(), aggregates);
+        t->GetComponentAggregates(componentAttributes, aggregates);
       }
 
     }
@@ -1601,7 +1601,7 @@ bool RteProject::AddTarget(const string& name, const map<string, string>& attrib
       targetAttributes.RemoveAttribute("Bversion");
     }
 
-    bool changed = target->SetAttributes(targetAttributes);
+    bool changed = target->CopyAttributes(targetAttributes);
     if (supported) {
       if (bNewTarget) {
         AddTargetInfo(name);

libs/rtemodel/src/RteTarget.cpp

@@ -582,6 +582,13 @@ void RteTarget::ProcessAttributes() // called from SetAttributes(), AddAttribute
 {
   if (m_bDestroy)
     return;
+
+  // set empty board name to filter-out board-specific items if device is selected
+  if(HasAttribute("Dname") &&
+    !HasAttribute("Bname")) {
+    AddAttribute("Bname", "");
+  }
+
   m_device = 0;
   RteModel *model = GetFilteredModel();
   if (!model)

libs/rtemodel/test/src/RteChkTest.cpp

@@ -36,7 +36,7 @@ From DFP: 24\n\
 From BSP: 0\n\
 \n\
 Devices: 10\n\
-Boards: 14\n\
+Boards: 15\n\
 \n\
 completed\n";
 
@@ -53,7 +53,7 @@ completed\n";
   EXPECT_EQ(rteChk.GetPackCount(), 8);
   EXPECT_EQ(rteChk.GetComponentCount(), 60);
   EXPECT_EQ(rteChk.GetDeviceCount(), 10);
-  EXPECT_EQ(rteChk.GetBoardCount(), 14);
+  EXPECT_EQ(rteChk.GetBoardCount(), 15);
 
   string s = RteUtils::EnsureLf(ss.str());
   EXPECT_EQ(s, summary);

libs/rtemodel/test/src/RteItemTest.cpp

@@ -262,4 +262,33 @@ TEST(RteItemTest, GetInstancePathName) {
   EXPECT_EQ(instanceFile, "MySolDir/.cmsis/MySolName+MyTarget.dbgconf");
 }
 
+TEST(RteTargetTest, ProcessAttributes_Bname) {
+  RteTarget target(nullptr, nullptr, "test", {});
+
+  // Bname is not set by default
+  EXPECT_FALSE(target.HasAttribute("Bname"));
+
+  // Bname is not set when no Dname
+  target.SetAttributes({{"Dfpu", "NO_FPU"}});
+  EXPECT_FALSE(target.HasAttribute("Bname"));
+  target.ClearAttributes();
+
+  // Bname is set to empty if Dname and no Bname
+  target.SetAttributes({{"Dname", "MyDevice"}});
+  EXPECT_TRUE(target.HasAttribute("Bname"));
+  EXPECT_EQ(target.GetAttribute("Bname"), "");
+  target.ClearAttributes();
+
+  // Bname only
+  target.SetAttributes({{"Bname", "MyBoard"}});
+  EXPECT_TRUE(target.HasAttribute("Bname"));
+  EXPECT_EQ(target.GetAttribute("Bname"), "MyBoard");
+  target.ClearAttributes();
+
+  // Bname with Dname
+  target.SetAttributes({{"Bname", "MyBoard"}, {"Dname", "MyDevice"}});
+  EXPECT_TRUE(target.HasAttribute("Bname"));
+  EXPECT_EQ(target.GetAttribute("Bname"), "MyBoard");
+}
+
 // end of RteItemTest.cpp

libs/rtemodel/test/src/RteModelTest.cpp

@@ -433,7 +433,7 @@ TEST_F(RteModelPrjTest, LoadCprj) {
   EXPECT_EQ(boardName, "RteTest Test board");
   // get layers
   auto& allLayerDescriptors = rteKernel.GetGlobalModel()->GetLayerDescriptors();
-  EXPECT_EQ(allLayerDescriptors.size(), 10);
+  EXPECT_EQ(allLayerDescriptors.size(), 13);
   auto& filteredLayerDescriptors = activeTarget->GetFilteredModel()->GetLayerDescriptors();
   EXPECT_EQ(filteredLayerDescriptors.size(), 8);
 
@@ -1077,7 +1077,7 @@ TEST_F(RteModelPrjTest, LoadCprjM4) {
   EXPECT_TRUE(boardName.empty());
   // get layers
   auto& allLayerDescriptors = rteKernel.GetGlobalModel()->GetLayerDescriptors();
-  EXPECT_EQ(allLayerDescriptors.size(), 10);
+  EXPECT_EQ(allLayerDescriptors.size(), 13);
   auto& filteredLayerDescriptors = activeTarget->GetFilteredModel()->GetLayerDescriptors();
   EXPECT_EQ(filteredLayerDescriptors.size(), 7);
   ca = activeTarget->GetComponentAggregate("ARM::Device:Startup");
@@ -1160,7 +1160,7 @@ TEST_F(RteModelPrjTest, LoadCprjM4_Board) {
   EXPECT_EQ(boardName, "RteTest CM4 board");
   // get layers
   auto& allLayerDescriptors = rteKernel.GetGlobalModel()->GetLayerDescriptors();
-  EXPECT_EQ(allLayerDescriptors.size(), 10);
+  EXPECT_EQ(allLayerDescriptors.size(), 13);
   auto& filteredLayerDescriptors = activeTarget->GetFilteredModel()->GetLayerDescriptors();
   EXPECT_EQ(filteredLayerDescriptors.size(), 7);
 

libs/xmltree/include/XmlItem.h

@@ -47,13 +47,13 @@ class XmlItem
    * @brief parametrized constructor
    * @param tag XML tag
   */
-  XmlItem(const std::string& tag) : m_tag(tag), m_lineNumber(0) {};
+  explicit XmlItem(const std::string& tag) : m_tag(tag), m_lineNumber(0) {};
 
   /**
    * @brief parametrized constructor to instantiate with given attributes
    * @param attributes collection as key to value pairs
   */
-  XmlItem(const std::map<std::string, std::string>& attributes) : m_attributes(attributes), m_lineNumber(0) {};
+  explicit XmlItem(const std::map<std::string, std::string>& attributes) : m_attributes(attributes), m_lineNumber(0) {};
 
   /**
    * @brief virtual destructor
@@ -163,7 +163,7 @@ class XmlItem
    * @param attributes instance of XmlItem containing attributes to assign
    * @return true if attributes are set
   */
-  bool SetAttributes(const XmlItem &attributes);
+  bool CopyAttributes(const XmlItem &attributes);
 
   /**
    * @brief assign specified attribute value from supplied object to this one