Merge pull request #2404 from nasa/revert-2399-fix-2395-cfe-test-msgid

Revert "Fix #2395, do not directly use cfe_test_msgids.h"
nasa · Jul 17, 2023 · a8b20ac · a8b20ac
2 parents 75b807b + 1c9f44b
commit a8b20ac
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 1 deletion.
diff --git a/modules/cfe_testcase/src/sb_sendrecv_test.c b/modules/cfe_testcase/src/sb_sendrecv_test.c
@@ -29,6 +29,7 @@
 
 #include "cfe_test.h"
 #include "cfe_msgids.h"
+#include "cfe_test_msgids.h"
 
 #define CFE_FT_STRINGBUF_SIZE 12
 

diff --git a/modules/cfe_testcase/src/sb_subscription_test.c b/modules/cfe_testcase/src/sb_subscription_test.c
@@ -29,6 +29,7 @@
 
 #include "cfe_test.h"
 #include "cfe_msgids.h"
+#include "cfe_test_msgids.h"
 
 /*
  * This test procedure should be agnostic to specific MID values, but it should

diff --git a/modules/cfe_testcase/src/tbl_information_test.c b/modules/cfe_testcase/src/tbl_information_test.c
@@ -30,6 +30,7 @@
 #include "cfe_test.h"
 #include "cfe_test_table.h"
 #include "cfe_msgids.h"
+#include "cfe_test_msgids.h"
 
 void TestGetStatus(void)
 {

diff --git a/modules/cfe_testcase/src/tbl_registration_test.c b/modules/cfe_testcase/src/tbl_registration_test.c
@@ -30,6 +30,7 @@
 #include "cfe_test.h"
 #include "cfe_test_table.h"
 #include "cfe_msgids.h"
+#include "cfe_test_msgids.h"
 
 int32 CallbackFunc(void *TblPtr)
 {

diff --git a/modules/core_api/config/default_cfe_msgids.h b/modules/core_api/config/default_cfe_msgids.h
@@ -37,6 +37,5 @@
 #include "cfe_sb_msgids.h"
 #include "cfe_tbl_msgids.h"
 #include "cfe_time_msgids.h"
-#include "cfe_test_msgids.h"
 
 #endif /* CFE_MSGIDS_H */