Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cFE Integration candidate: Equuleus-rc1+dev19 #2609

Merged
merged 5 commits into from
Oct 3, 2024
Merged

cFE Integration candidate: Equuleus-rc1+dev19 #2609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ebeb8f3
Fix #2597, fix sb coverage test failure
Sep 10, 2024
31c8405
Fix #2605 Pass the CMAKE_PREFIX_PATH to targets
renn0xtek9 Sep 24, 2024
fa4088c
Merge pull request #2602 from avan989:Fix-2597-sb-coverage-test-failure
dzbaker Oct 3, 2024
90d3ed6
Merge pull request #2606 from renn0xtek9:fix-2605-Pass-CMAKE_PREFIX_P…
dzbaker Oct 3, 2024
d711bb5
Updating documentation and version numbers for equuleus-rc1+dev205
dzbaker Oct 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
4 changes: 4 additions & 0 deletions cmake/Makefile.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions cmake/mission_build.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion modules/core_api/fsw/inc/cfe_version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
96 changes: 82 additions & 14 deletions modules/sb/ut-coverage/sb_UT.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

/*
Expand Down
Loading