Skip to content

Commit 1f461fe

Browse files
astrogeconmullane
andcommitted
Fix #1780, RTEMS CFE_FT_Global build failure
Fixes RTEMS compilation error. Moves the assignment of the TBL related elements of `CFE_FT_Global` from 'cfe_test_table' to `cfe_test` to avoid duplicate definitions error. Makes `cfe_test.c` first in CMakeLists dependency list Co-authored-by: Niall Mullane <nmullane@users.noreply.github.com>
1 parent 600fd7a commit 1f461fe

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

modules/cfe_testcase/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ include_directories(inc)
22

33
# Filenames based on doxygen groups.
44
# Create the app module
5-
add_cfe_app(cfe_testcase
6-
src/cfe_test_table.c
5+
add_cfe_app(cfe_testcase
76
src/cfe_test.c
7+
src/cfe_test_table.c
88
src/es_application_control_test.c
99
src/es_info_test.c
1010
src/es_task_test.c

modules/cfe_testcase/src/cfe_test.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,11 @@ CFE_FT_Global_t CFE_FT_Global;
4141
*/
4242
void CFE_TestMain(void)
4343
{
44+
/* Constant Table information used by all table tests */
45+
CFE_FT_Global.TblName = "TestTable";
46+
CFE_FT_Global.RegisteredTblName = "CFE_TEST_APP.TestTable";
47+
CFE_FT_Global.TblFilename = "test_tbl.tbl";
48+
4449
/*
4550
* Register this test app with CFE assert
4651
*

modules/cfe_testcase/src/cfe_test_table.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,10 @@
3333
#include "cfe_test.h"
3434
#include "cfe_test_table.h"
3535

36-
/* Constant Table information used by all table tests */
37-
CFE_FT_Global_t CFE_FT_Global = {
38-
.TblName = "TestTable", .RegisteredTblName = "CFE_TEST_APP.TestTable", .TblFilename = "test_tbl.tbl"};
39-
4036
/* Setup function to register a table */
4137
void RegisterTestTable(void)
4238
{
39+
4340
UtAssert_INT32_EQ(CFE_TBL_Register(&CFE_FT_Global.TblHandle, CFE_FT_Global.TblName, sizeof(TBL_TEST_Table_t),
4441
CFE_TBL_OPT_DEFAULT, NULL),
4542
CFE_SUCCESS);

modules/cfe_testcase/src/cfe_test_table.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@
3939
*/
4040
#include "cfe_test.h"
4141

42-
CFE_FT_Global_t CFE_FT_Global;
43-
4442
void RegisterTestTable(void);
4543
void UnregisterTestTable(void);
4644

modules/cfe_testcase/src/tbl_content_access_test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ void TestGetReleaseAddresses(void)
160160
}
161161

162162
void TBLContentAccessTestSetup(void)
163-
{
163+
{
164164
UtTest_Add(TestGetAddress, RegisterTestTable, NULL, "Test Table Get Address");
165165
UtTest_Add(TestReleaseAddress, RegisterTestTable, NULL, "Test Table Release Address");
166166
UtTest_Add(TestGetReleaseAddresses, NULL, NULL, "Test Table Get and Release Addresses");

modules/cfe_testcase/src/tbl_content_mang_test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ void TestModified(void)
122122
}
123123

124124
void TBLContentMangTestSetup(void)
125-
{
125+
{
126126
UtTest_Add(TestLoad, RegisterTestTable, UnregisterTestTable, "Test Table Load");
127127
UtTest_Add(TestUpdate, RegisterTestTable, UnregisterTestTable, "Test Table Update");
128128
UtTest_Add(TestValidate, RegisterTestTable, UnregisterTestTable, "Test Table Validate");

modules/cfe_testcase/src/tbl_registration_test.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ void TestTableShare(void)
132132
}
133133

134134
void TBLRegistrationTestSetup(void)
135-
{
135+
{
136136
UtTest_Add(TestTableRegistration, NULL, NULL, "Test Table Registration");
137137
UtTest_Add(TestTableShare, NULL, NULL, "Test Table Sharing");
138138
}

0 commit comments

Comments
 (0)