[cbuild-run] Fix missing debug sequences

Author: grasci-arm

test/packs/ARM/RteTest_DFP/0.2.0/ARM.RteTest_DFP.pdsc

@@ -80,6 +80,8 @@
               Message(2, "Incorrect ID! Abort connection.");
             </block>
           </control>
+          <control while="(ReadDP(DP_CTRL_STAT) &amp; 0xA0000000) != 0xA0000000" timeout="1000000"/>
+          <block/>
         </sequence>
 
         <!-- default DebugPortStop extended with Option Byte Loading capability -->

tools/projmgr/src/ProjMgrCbuildRun.cpp

@@ -124,7 +124,7 @@ void ProjMgrCbuildRun::SetDebugSequencesNode(YAML::Node node, const std::vector<
 
 void ProjMgrCbuildRun::SetDebugSequencesBlockNode(YAML::Node node, const std::vector<DebugSequencesBlockType>& blocks) {
   for (const auto& block : blocks) {
-    if (block.execute.empty() && block.blocks.empty()) {
+    if (block.execute.empty() && block.blocks.empty() && block.control_if.empty() && block.control_while.empty()) {
       continue;
     }
     YAML::Node blockNode;

tools/projmgr/test/data/TestRunDebug/ref/run-debug+TestHW.cbuild-run.yml

@@ -88,6 +88,8 @@ cbuild-run:
           execute: |
             Query(0, "Incorrect ID! Abort connection", 1);
             Message(2, "Incorrect ID! Abort connection.");
+        - while: (ReadDP(DP_CTRL_STAT) & 0xA0000000) != 0xA0000000
+          timeout: 1000000
     - name: DebugPortStop
       blocks:
         - execute: |

tools/projmgr/test/data/TestRunDebug/ref/run-debug+TestHW2.cbuild-run.yml

@@ -89,6 +89,8 @@ cbuild-run:
           execute: |
             Query(0, "Incorrect ID! Abort connection", 1);
             Message(2, "Incorrect ID! Abort connection.");
+        - while: (ReadDP(DP_CTRL_STAT) & 0xA0000000) != 0xA0000000
+          timeout: 1000000
     - name: DebugPortStop
       blocks:
         - execute: |

tools/projmgr/test/data/TestRunDebug/ref/run-debug+TestHW3.cbuild-run.yml

@@ -90,6 +90,8 @@ cbuild-run:
           execute: |
             Query(0, "Incorrect ID! Abort connection", 1);
             Message(2, "Incorrect ID! Abort connection.");
+        - while: (ReadDP(DP_CTRL_STAT) & 0xA0000000) != 0xA0000000
+          timeout: 1000000
     - name: DebugPortStop
       blocks:
         - execute: |