Skip to content

Commit a048518

Browse files
committed
Fix #2352, make shared tbl configurable
1 parent b429d91 commit a048518

File tree

4 files changed

+11
-3
lines changed

4 files changed

+11
-3
lines changed

modules/cfe_testcase/src/cfe_test.h

+8
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,14 @@ extern CFE_FT_Global_t CFE_FT_Global;
6060
*/
6161
#define CFE_ASSERT_LOG_FILE_NAME "/cf/cfe_test.log"
6262

63+
/**
64+
* Name of the shared table used by CFE_TEST_APP for requirements verification
65+
*
66+
* This filename was made configurable such that projects can replace the
67+
* sample app table with a project specific table for the purpose of CI/CD.
68+
*/
69+
#define SHARED_TABLE_NAME "SAMPLE_APP.SampleAppTable"
70+
6371
void TimeInRange(CFE_TIME_SysTime_t Start, CFE_TIME_SysTime_t Time, CFE_TIME_SysTime_t Range, const char *Str);
6472

6573
void CFE_TestMain(void);

modules/cfe_testcase/src/tbl_content_access_test.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ void TestGetAddress(void)
4545
TBL_TEST_Table_t TestTable = {1, 2};
4646

4747
CFE_TBL_Handle_t SharedTblHandle = CFE_TBL_BAD_TABLE_HANDLE;
48-
const char * SharedTblName = "SAMPLE_APP.SampleAppTable";
48+
const char * SharedTblName = "SHARED_TABLE_NAME";
4949

5050
UtPrintf("Testing: CFE_TBL_GetAddress");
5151

modules/cfe_testcase/src/tbl_information_test.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ void TestGetInfo(void)
7777
void TestNotifyByMessage(void)
7878
{
7979
CFE_TBL_Handle_t SharedTblHandle = CFE_TBL_BAD_TABLE_HANDLE;
80-
const char * SharedTblName = "SAMPLE_APP.SampleAppTable";
80+
const char * SharedTblName = "SHARED_TABLE_NAME";
8181
CFE_SB_MsgId_t TestMsgId = CFE_SB_ValueToMsgId(CFE_TEST_CMD_MID);
8282
CFE_MSG_FcnCode_t TestCmdCode = 0;
8383
uint32 TestParameter = 0;

modules/cfe_testcase/src/tbl_registration_test.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ void TestTableShare(void)
190190
{
191191
UtPrintf("Testing: CFE_TBL_Share");
192192
CFE_TBL_Handle_t SharedTblHandle;
193-
const char * SharedTblName = "SAMPLE_APP.SampleAppTable";
193+
const char * SharedTblName = "SHARED_TABLE_NAME";
194194
const char * BadTblName = "SampleAppTable";
195195

196196
UtAssert_INT32_EQ(CFE_TBL_Share(NULL, SharedTblName), CFE_TBL_BAD_ARGUMENT);

0 commit comments

Comments
 (0)