Skip to content

Commit

Permalink
Fix #1946, Correct typos in test, error messages
Browse files Browse the repository at this point in the history
Also fixes typo in github workflow error string
  • Loading branch information
thnkslprpt authored and astrogeco committed Sep 11, 2021
1 parent fcca73a commit 47b700c
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/functional-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ jobs:
temp=$(grep -c "BEGIN" cf/cfe_test.tmp)
if [ $temp -eq $counter ]; then
echo "Test is frozen. Quiting"
echo "Test is frozen. Quitting"
break
fi
Expand Down
4 changes: 2 additions & 2 deletions modules/core_private/ut-stubs/src/ut_osprintf_stubs.c
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ const char *UT_OSP_MESSAGES[] = {
[UT_OSP_LIBRARY_SLOTS] = "%s: No free library slots available\n",
[UT_OSP_EXTRACT_FILENAME_UT] = "%s: Unable to extract filename from path: %s.\n",
[UT_OSP_APP_PATH_FILE_TOO_LONG] = "%s: Application path plus file name length (%d) exceeds max allowed (%d)\n",
[UT_OSP_REFORMAT_VOLATILE] = "%s: Error Re-Formating Volatile(RAM) Volume. EC = %ld\n",
[UT_OSP_REFORMAT_VOLATILE] = "%s: Error Re-Formatting Volatile(RAM) Volume. EC = %ld\n",
[UT_OSP_EXTRACT_FILENAME_UT55] = "%s: Could not load file:%s. EC = %ld\n",
[UT_OSP_EXTRACT_FILENAME_UT46] = "%s: Unable to extract filename from path: %s.\n",
[UT_OSP_NO_FREE_APP_SLOTS] = "%s: No free application slots available\n",
Expand All @@ -75,7 +75,7 @@ const char *UT_OSP_MESSAGES[] = {
[UT_OSP_APP_INIT] = "%s: Application Init Failed,RC=0x%08X\n",
[UT_OSP_POR_MAX_PROC_RESETS] = "%s: POWER ON RESET due to max proc resets (Commanded).\n",
[UT_OSP_CANNOT_RESTART_APP] = "%s: Cannot Restart Application %s, It is not running.\n",
[UT_OSP_INSUFF_FREE_SPACE] = "%s: Insufficent Free Space on Volatile Disk, Reformatting.\n",
[UT_OSP_INSUFF_FREE_SPACE] = "%s: Insufficient Free Space on Volatile Disk, Reformatting.\n",
[UT_OSP_LOAD_SHARED_LIBRARY] = "%s: Could not load cFE Shared Library\n",
[UT_OSP_POR_HW_SPECIAL] = "%s: POWER ON RESET due to HW Special Cmd (Hw Spec Cmd).\n",
[UT_OSP_APP_CREATE] = "%s: AppCreate Error: TaskCreate %s Failed. EC = %ld!\n",
Expand Down
4 changes: 2 additions & 2 deletions modules/es/fsw/src/cfe_es_start.c
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,7 @@ void CFE_ES_InitializeFileSystems(uint32 StartType)

if (PercentFree < CFE_PLATFORM_ES_RAM_DISK_PERCENT_RESERVED)
{
CFE_ES_WriteToSysLog("%s: Insufficent Free Space on Volatile Disk, Reformatting.\n", __func__);
CFE_ES_WriteToSysLog("%s: Insufficient Free Space on Volatile Disk, Reformatting.\n", __func__);

/*
** First, unmount the disk
Expand Down Expand Up @@ -641,7 +641,7 @@ void CFE_ES_InitializeFileSystems(uint32 StartType)
else
{

CFE_ES_WriteToSysLog("%s: Error Re-Formating Volatile(RAM) Volume. EC = %ld\n", __func__,
CFE_ES_WriteToSysLog("%s: Error Re-Formatting Volatile(RAM) Volume. EC = %ld\n", __func__,
(long)OsStatus);
/*
** Delay to allow the message to be read
Expand Down
2 changes: 1 addition & 1 deletion modules/sb/fsw/src/cfe_sb_api.c
Original file line number Diff line number Diff line change
Expand Up @@ -1301,7 +1301,7 @@ int32 CFE_SB_UnsubscribeFull(CFE_SB_MsgId_t MsgId, CFE_SB_PipeId_t PipeId, uint8

case CFE_SB_UNSUB_ARG_ERR_EID:
CFE_EVS_SendEventWithAppID(CFE_SB_UNSUB_ARG_ERR_EID, CFE_EVS_EventType_ERROR, CFE_SB_Global.AppId,
"UnSubscribe Err:Bad Arg,MsgId 0x%x,PipeId %lu,app %s,scope %d",
"Unsubscribe Err:Bad Arg,MsgId 0x%x,PipeId %lu,app %s,scope %d",
(unsigned int)CFE_SB_MsgIdToValue(MsgId), CFE_RESOURCEID_TO_ULONG(PipeId),
CFE_SB_GetAppTskName(TskId, FullName), (int)Scope);
break;
Expand Down
2 changes: 1 addition & 1 deletion modules/sbr/ut-coverage/test_cfe_sbr_route_unsorted.c
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ void Test_SBR_Route_Unsort_General(void)
CFE_SBR_ForEachRouteId(Test_SBR_Callback, &count, NULL);
UtAssert_INT32_EQ(count, 0);

UtPrintf("Add maximum mesage id value");
UtPrintf("Add maximum message id value");
msgid = CFE_SB_ValueToMsgId(CFE_PLATFORM_SB_HIGHEST_VALID_MSGID);
routeid = CFE_SBR_AddRoute(msgid, &collisions);
UtAssert_INT32_EQ(collisions, 0);
Expand Down

0 comments on commit 47b700c

Please sign in to comment.