Merge pull request #2464 from nasa/integration-candidate

cFE Integration candidate: Caelum-rc4+dev64
nasa · Nov 14, 2023 · b72dd4e · b72dd4e
2 parents 0316672 + cd0b204
commit b72dd4e
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## Development Build: v7.0.0-rc4+dev411
+- rename reference table
+- Remove nonexist reference for perf tool
+- See <https://github.com/nasa/cFE/pull/2462> and <https://github.com/nasa/cFE/pull/2408>
+
 ## Development Build: v7.0.0-rc4+dev405
 - add code coverage for null check
 - See <https://github.com/nasa/cFE/pull/2377>

diff --git a/cmake/sample_defs/cpu1_cfe_es_startup.scr b/cmake/sample_defs/cpu1_cfe_es_startup.scr
@@ -1,9 +1,9 @@
 CFE_LIB, cfe_assert,  CFE_Assert_LibInit, ASSERT_LIB,    0,   0,     0x0, 0;
 CFE_LIB, sample_lib,  SAMPLE_LIB_Init,    SAMPLE_LIB,    0,   0,     0x0, 0;
 CFE_APP, sample_app,  SAMPLE_APP_Main,    SAMPLE_APP,   50,   16384, 0x0, 0;
-CFE_APP, ci_lab,      CI_Lab_AppMain,     CI_LAB_APP,   60,   16384, 0x0, 0;
+CFE_APP, ci_lab,      CI_LAB_AppMain,     CI_LAB_APP,   60,   16384, 0x0, 0;
 CFE_APP, to_lab,      TO_LAB_AppMain,     TO_LAB_APP,   70,   16384, 0x0, 0;
-CFE_APP, sch_lab,     SCH_Lab_AppMain,    SCH_LAB_APP,  80,   16384, 0x0, 0;
+CFE_APP, sch_lab,     SCH_LAB_AppMain,    SCH_LAB_APP,  80,   16384, 0x0, 0;
 !
 ! Startup script fields:
 ! 1. Object Type      -- CFE_APP for an Application, or CFE_LIB for a library.

diff --git a/modules/cfe_testcase/src/cfe_test.h b/modules/cfe_testcase/src/cfe_test.h
@@ -66,7 +66,7 @@ extern CFE_FT_Global_t CFE_FT_Global;
  * This filename was made configurable such that projects can replace the
  * sample app table with a project specific table for the purpose of CI/CD.
  */
-#define CFE_ASSERT_SHARED_TBL_NAME "SAMPLE_APP.SampleAppTable"
+#define CFE_ASSERT_SHARED_TBL_NAME "SAMPLE_APP.ExampleTable"
 
 void TimeInRange(CFE_TIME_SysTime_t Start, CFE_TIME_SysTime_t Time, CFE_TIME_SysTime_t Range, const char *Str);
 

diff --git a/modules/cfe_testcase/src/tbl_registration_test.c b/modules/cfe_testcase/src/tbl_registration_test.c
@@ -191,7 +191,7 @@ void TestTableShare(void)
     UtPrintf("Testing: CFE_TBL_Share");
     CFE_TBL_Handle_t SharedTblHandle;
     const char *     SharedTblName = CFE_ASSERT_SHARED_TBL_NAME;
-    const char *     BadTblName    = "SampleAppTable";
+    const char *     BadTblName    = "ExampleTable";
 
     UtAssert_INT32_EQ(CFE_TBL_Share(NULL, SharedTblName), CFE_TBL_BAD_ARGUMENT);
     UtAssert_INT32_EQ(CFE_TBL_Share(&SharedTblHandle, SharedTblName), CFE_SUCCESS);

diff --git a/modules/core_api/fsw/inc/cfe_es.h b/modules/core_api/fsw/inc/cfe_es.h
@@ -1451,7 +1451,7 @@ CFE_Status_t CFE_ES_GetMemPoolStats(CFE_ES_MemPoolStats_t *BufPtr, CFE_ES_MemHan
 ** \par Description
 **        This macro logs the entry or start event/marker for the specified
 **        entry \c id. This macro, in conjunction with the #CFE_ES_PerfLogExit,
-**        is used by the Software Performance Analysis tool (see section 5.15).
+**        is used by the Software Performance Analysis tool.
 **
 ** \par Assumptions, External Events, and Notes:
 **        None
@@ -1470,7 +1470,7 @@ CFE_Status_t CFE_ES_GetMemPoolStats(CFE_ES_MemPoolStats_t *BufPtr, CFE_ES_MemHan
 ** \par Description
 **        This macro logs the exit or end event/marker for the specified
 **        entry \c id. This macro, in conjunction with the #CFE_ES_PerfLogEntry,
-**        is used by the Software Performance Analysis tool (see section 5.15).
+**        is used by the Software Performance Analysis tool.
 **
 ** \par Assumptions, External Events, and Notes:
 **        None
@@ -1491,7 +1491,7 @@ CFE_Status_t CFE_ES_GetMemPoolStats(CFE_ES_MemPoolStats_t *BufPtr, CFE_ES_MemHan
 ** \par Description
 **        This function logs the entry and exit marker for the specified
 **        \c id. This function is used by the Software Performance Analysis
-**        tool (see section 5.15).
+**        tool.
 **
 ** \par Assumptions, External Events, and Notes:
 

diff --git a/modules/core_api/fsw/inc/cfe_version.h b/modules/core_api/fsw/inc/cfe_version.h
@@ -26,7 +26,7 @@
 #define CFE_VERSION_H
 
 /* Development Build Macro Definitions */
-#define CFE_BUILD_NUMBER   405 /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */
+#define CFE_BUILD_NUMBER   411 /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */
 #define CFE_BUILD_BASELINE "v7.0.0-rc4" /**< @brief Development: Reference git tag for build number */
 
 /* See \ref cfsversions for definitions */