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.

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

Update UT entry point to correspond with OSAL/UT Assert change #436

Merged
merged 2 commits into from
Jan 10, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions fsw/cfe-core/unit-test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,13 @@ foreach(MODULE ${CFE_CORE_MODULES})
target_link_libraries(${CFE_CORE_TARGET}_${MODULE}_UT
ut_${CFE_CORE_TARGET}_support
ut_cfe-core_stubs
ut_bsp)
ut_assert)

# Also add the C FLAGS to the link command
# This should enable coverage analysis on platforms that support this
set_target_properties(${CFE_CORE_TARGET}_${MODULE}_UT PROPERTIES
LINK_FLAGS "${UT_C_FLAGS}")

add_test(${CFE_CORE_TARGET}_${MODULE}_UT ${CFE_CORE_TARGET}_${MODULE}_UT)
install(TARGETS ${CFE_CORE_TARGET}_${MODULE}_UT DESTINATION ${TGTNAME}/${UT_INSTALL_SUBDIR})
endforeach(MODULE ${CFE_CORE_MODULES})
Expand Down
2 changes: 1 addition & 1 deletion fsw/cfe-core/unit-test/es_UT.c
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ static int32 ES_UT_SetAppStateHook(void *UserObj, int32 StubRetcode,
return StubRetcode;
}

void OS_Application_Startup(void)
void UtTest_Setup(void)
{
UT_Init("es");
UT_Text("cFE ES Unit Test Output File\n\n");
Expand Down
2 changes: 1 addition & 1 deletion fsw/cfe-core/unit-test/evs_UT.c
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ static void UT_EVS_DoGenericCheckEvents(void (*Func)(void), UT_EVS_EventCapture_
/*
** Functions
*/
void OS_Application_Startup(void)
void UtTest_Setup(void)
{
/* Initialize unit test */
UT_Init("evs");
Expand Down
2 changes: 1 addition & 1 deletion fsw/cfe-core/unit-test/fs_UT.c
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ static CFE_FS_Decompress_State_t UT_FS_Decompress_State;
/*
** Functions
*/
void OS_Application_Startup(void)
void UtTest_Setup(void)
{
/* Initialize unit test */
UT_Init("fs");
Expand Down
2 changes: 1 addition & 1 deletion fsw/cfe-core/unit-test/sb_UT.c
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ static char cMsg[UT_MAX_MESSAGE_LENGTH];
/*
** Functions
*/
void OS_Application_Startup(void)
void UtTest_Setup(void)
{
UT_Init("sb");
UT_Text("cFE SB Unit Test Output File\n\n");
Expand Down
2 changes: 1 addition & 1 deletion fsw/cfe-core/unit-test/tbl_UT.c
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ CFE_TBL_RegistryRec_t Original[CFE_PLATFORM_TBL_MAX_NUM_TABLES];
/*
** Functions
*/
void OS_Application_Startup(void)
void UtTest_Setup(void)
{
/* Initialize unit test */
UT_Init("tbl");
Expand Down
2 changes: 1 addition & 1 deletion fsw/cfe-core/unit-test/time_UT.c
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ void OS_SelectTone(int16 Signal)
}
#endif

void OS_Application_Startup(void)
void UtTest_Setup(void)
{
/* Initialize unit test */
UT_Init("time");
Expand Down