Merge pull request #2609 from nasa/integration-candidate

cFE Integration candidate: Equuleus-rc1+dev19

Author: dzbaker

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## Development Build: equuleus-rc1+dev205
+- fix sb coverage test failure
+- Pass the CMAKE_PREFIX_PATH to targets
+- See <https://github.com/nasa/cFE/pull/2602> and <https://github.com/nasa/cFE/pull/2606>
+
 ## Development Build: equuleus-rc1+dev199
 - Bump actions/download-artifact from 3 to 4.1.7 in /.github/workflows
 - See <https://github.com/nasa/cFE/pull/2599>

cmake/Makefile.sample

@@ -115,6 +115,10 @@ ifneq ($(BUILDTYPE),)
 PREP_OPTS += -DCMAKE_BUILD_TYPE=$(BUILDTYPE)
 endif
 
+ifneq ($(CMAKE_PREFIX_PATH),)
+PREP_OPTS += -DCMAKE_PREFIX_PATH=$(CMAKE_PREFIX_PATH)
+endif
+
 all:
 	$(MAKE) --no-print-directory -C "$(O)" mission-all
 

cmake/mission_build.cmake

@@ -603,6 +603,7 @@ function(process_arch TARGETSYSTEM)
         -DMISSION_BINARY_DIR=${MISSION_BINARY_DIR}
         -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
         -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
+        -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
         -DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=${CMAKE_EXPORT_COMPILE_COMMANDS}
         -DCFE_EDS_ENABLED_BUILD:BOOL=${CFE_EDS_ENABLED_BUILD}
         ${SELECTED_TOOLCHAIN_FILE}

modules/core_api/fsw/inc/cfe_version.h

@@ -26,7 +26,7 @@
 #define CFE_VERSION_H
 
 /* Development Build Macro Definitions */
-#define CFE_BUILD_NUMBER    199 /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */
+#define CFE_BUILD_NUMBER    205 /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */
 #define CFE_BUILD_BASELINE  "equuleus-rc1" /**< @brief Development: Reference git tag for build number */
 #define CFE_BUILD_DEV_CYCLE "equuleus-rc2" /**< @brief Development: Release name for current development cycle */
 #define CFE_BUILD_CODENAME  "Equuleus"     /**< @brief: Development: Code name for the current build */

modules/sb/ut-coverage/sb_UT.c

@@ -4629,56 +4629,124 @@ void Test_CFE_SB_ValidateMsgId(void)
 
 void Test_CFE_SB_CmdTopicIdToMsgId(void)
 {
-    CFE_SB_MsgId_Atom_t MsgIdVal;
+    CFE_SB_MsgId_Atom_t MsgIdVal1;
+    CFE_SB_MsgId_Atom_t MsgIdVal2;
+    bool ReturnCode1 = false;
+    bool ReturnCode2 = false;
+
+    MsgIdVal1 = CFE_SB_CmdTopicIdToMsgId(1, 1);
+    ReturnCode1 = CFE_SB_IsValidMsgId(CFE_SB_ValueToMsgId(MsgIdVal1));
 
-    MsgIdVal = CFE_SB_CmdTopicIdToMsgId(1, 1);
-    UtAssert_BOOL_TRUE(CFE_SB_IsValidMsgId(CFE_SB_ValueToMsgId(MsgIdVal)));
+    MsgIdVal2 = CFE_SB_CmdTopicIdToMsgId(1, 0);
+    ReturnCode2 = CFE_SB_IsValidMsgId(CFE_SB_ValueToMsgId(MsgIdVal2));
 
-    MsgIdVal = CFE_SB_CmdTopicIdToMsgId(1, 0);
-    UtAssert_BOOL_TRUE(CFE_SB_IsValidMsgId(CFE_SB_ValueToMsgId(MsgIdVal)));
+    if(MsgIdVal1 == 0 || MsgIdVal2 == 0)
+    {
+        /* Macro does not exist. Topic ID has not been implemented. */
+        UtAssert_MIR("Topic ID has not been implemented. ");
+    }
+    else
+    {
+        UtAssert_BOOL_TRUE(ReturnCode1);
+        UtAssert_BOOL_TRUE(ReturnCode2);
+    }
 }
 
 void Test_CFE_SB_TlmTopicIdToMsgId(void)
 {
-    CFE_SB_MsgId_Atom_t MsgIdVal;
+    CFE_SB_MsgId_Atom_t MsgIdVal1;
+    CFE_SB_MsgId_Atom_t MsgIdVal2;
+    bool ReturnCode1 = false;
+    bool ReturnCode2 = false;
+
+    MsgIdVal1 = CFE_SB_TlmTopicIdToMsgId(1, 1);
+    ReturnCode1 = CFE_SB_IsValidMsgId(CFE_SB_ValueToMsgId(MsgIdVal1));
 
-    MsgIdVal = CFE_SB_TlmTopicIdToMsgId(1, 1);
-    UtAssert_BOOL_TRUE(CFE_SB_IsValidMsgId(CFE_SB_ValueToMsgId(MsgIdVal)));
+    MsgIdVal2 = CFE_SB_TlmTopicIdToMsgId(1, 0);
+    ReturnCode2 = CFE_SB_IsValidMsgId(CFE_SB_ValueToMsgId(MsgIdVal2));
 
-    MsgIdVal = CFE_SB_CmdTopicIdToMsgId(1, 0);
-    UtAssert_BOOL_TRUE(CFE_SB_IsValidMsgId(CFE_SB_ValueToMsgId(MsgIdVal)));
+    if(MsgIdVal1 == 0 || MsgIdVal2 == 0)
+    {
+        /* Macro does not exist. Topic ID has not been implemented. */
+        UtAssert_MIR("Topic ID has not been implemented. ");
+    }
+    else
+    {
+        UtAssert_BOOL_TRUE(ReturnCode1);
+        UtAssert_BOOL_TRUE(ReturnCode2);
+    }
 }
 
 void Test_CFE_SB_GlobalCmdTopicIdToMsgId(void)
 {
     CFE_SB_MsgId_Atom_t MsgIdVal;
+    bool ReturnCode = false;
 
     MsgIdVal = CFE_SB_GlobalCmdTopicIdToMsgId(2);
-    UtAssert_BOOL_TRUE(CFE_SB_IsValidMsgId(CFE_SB_ValueToMsgId(MsgIdVal)));
+    ReturnCode = CFE_SB_IsValidMsgId(CFE_SB_ValueToMsgId(MsgIdVal));
+    if(MsgIdVal == 0)
+    {
+        /* Macro does not exist. Topic ID has not been implemented. */
+        UtAssert_MIR("Topic ID has not been implemented. ");
+    }
+    else
+    {
+        UtAssert_BOOL_TRUE(ReturnCode);
+    }
 }
 
 void Test_CFE_SB_GlobalTlmTopicIdToMsgId(void)
 {
     CFE_SB_MsgId_Atom_t MsgIdVal;
+    bool ReturnCode = false;
 
     MsgIdVal = CFE_SB_GlobalTlmTopicIdToMsgId(2);
-    UtAssert_BOOL_TRUE(CFE_SB_IsValidMsgId(CFE_SB_ValueToMsgId(MsgIdVal)));
+    ReturnCode = CFE_SB_IsValidMsgId(CFE_SB_ValueToMsgId(MsgIdVal));
+    if(MsgIdVal == 0)
+    {
+        /* Macro does not exist. Topic ID has not been implemented. */
+        UtAssert_MIR("Topic ID has not been implemented. ");
+    }
+    else
+    {
+        UtAssert_BOOL_TRUE(ReturnCode);
+    }
 }
 
 void Test_CFE_SB_LocalCmdTopicIdToMsgId(void)
 {
     CFE_SB_MsgId_Atom_t MsgIdVal;
+    bool ReturnCode = false;
 
     MsgIdVal = CFE_SB_LocalCmdTopicIdToMsgId(3);
-    UtAssert_BOOL_TRUE(CFE_SB_IsValidMsgId(CFE_SB_ValueToMsgId(MsgIdVal)));
+    ReturnCode = CFE_SB_IsValidMsgId(CFE_SB_ValueToMsgId(MsgIdVal));
+    if(MsgIdVal == 0)
+    {
+        /* Macro does not exist. Topic ID has not been implemented. */
+        UtAssert_MIR("Topic ID has not been implemented. ");
+    }
+    else
+    {
+        UtAssert_BOOL_TRUE(ReturnCode);
+    }
 }
 
 void Test_CFE_SB_LocalTlmTopicIdToMsgId(void)
 {
     CFE_SB_MsgId_Atom_t MsgIdVal;
+    bool ReturnCode = false;
 
     MsgIdVal = CFE_SB_LocalTlmTopicIdToMsgId(3);
-    UtAssert_BOOL_TRUE(CFE_SB_IsValidMsgId(CFE_SB_ValueToMsgId(MsgIdVal)));
+    ReturnCode = CFE_SB_IsValidMsgId(CFE_SB_ValueToMsgId(MsgIdVal));
+    if(MsgIdVal == 0)
+    {
+        /* Macro does not exist. Topic ID has not been implemented. */
+        UtAssert_MIR("Topic ID has not been implemented. ");
+    }
+    else
+    {
+        UtAssert_BOOL_TRUE(ReturnCode);
+    }
 }
 
 /*