Merge branches 'fix-2393-leapseconds' and 'fix-2395-cfe-test-msgid'

jphickey · Jul 14, 2023 · c1999e9 · c1999e9
3 parents f6d7f8c + d3ca736 + e79184e
commit c1999e9
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 4 deletions.
diff --git a/modules/cfe_testcase/src/sb_sendrecv_test.c b/modules/cfe_testcase/src/sb_sendrecv_test.c
@@ -29,7 +29,6 @@
 
 #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,7 +29,6 @@
 
 #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,7 +30,6 @@
 #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,7 +30,6 @@
 #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/time/ut-coverage/time_UT.c b/modules/time/ut-coverage/time_UT.c
@@ -1278,6 +1278,7 @@ void Test_External(void)
     CFE_TIME_Global.ReferenceState[0].AtToneDelay.Subseconds = 0;
     CFE_TIME_Global.ReferenceState[0].AtToneLatch.Seconds    = 0;
     CFE_TIME_Global.ReferenceState[0].AtToneLatch.Subseconds = 0;
+    CFE_TIME_Global.ReferenceState[0].AtToneLeapSeconds      = 0;
     CFE_TIME_Global.MaxDelta.Seconds                         = 0;
     CFE_TIME_Global.MaxDelta.Subseconds                      = 1;
     CFE_TIME_Global.MaxLocalClock.Seconds                    = 0;