Merge pull request #2577 from nasa/integration-candidate

cFE Integration candidate: Equuleus-rc1+dev14
nasa · Jul 15, 2024 · d0e9564 · d0e9564
2 parents 00fe82a + e06b53a
commit d0e9564
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## Development Build: equuleus-rc1+dev167
+- CFE_TIME unit test failure when CFE_MISSION_TIME_AT_TONE_WILL_BE set to true
+- See <https://github.com/nasa/cFE/pull/2573>
+
 ## Development Build: equuleus-rc1+dev163
 - Improve CFE_SB_AllocateMessageBuffer error report
 - Update CFE_PLATFORM_ES_DEFAULT_SYSLOG_MODE macro in es_verify.h

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    163 /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */
+#define CFE_BUILD_NUMBER    167 /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */
 #define CFE_BUILD_BASELINE  "equuleus-rc1" /**< @brief Development: Reference git tag for build number */
 #define CFE_BUILD_DEV_CYCLE "equuleus-rc2" /**< @brief Development: Release name for current development cycle */
 #define CFE_BUILD_CODENAME  "Equuleus"     /**< @brief: Development: Code name for the current build */

diff --git a/modules/time/ut-coverage/time_UT.c b/modules/time/ut-coverage/time_UT.c
@@ -1081,7 +1081,7 @@ void Test_External(void)
     /* Test setting time data from MET (external source, state set) */
     UT_InitData();
     CFE_TIME_Global.ClockSource              = CFE_TIME_SourceSelect_EXTERNAL;
-    CFE_TIME_Global.ClockSetState            = CFE_TIME_SetState_WAS_SET;
+    CFE_TIME_Global.ClockSetState            = CFE_TIME_SetState_NOT_SET;
     settime.Seconds                          = 10;
     settime.Subseconds                       = 0;
     CFE_TIME_Global.ExternalCount            = 0;
@@ -1179,7 +1179,7 @@ void Test_External(void)
     /* Test setting time data from GPS (external source, state set) */
     UT_InitData();
     CFE_TIME_Global.ClockSource              = CFE_TIME_SourceSelect_EXTERNAL;
-    CFE_TIME_Global.ClockSetState            = CFE_TIME_SetState_WAS_SET;
+    CFE_TIME_Global.ClockSetState            = CFE_TIME_SetState_NOT_SET;
     settime.Seconds                          = 10;
     settime.Subseconds                       = 0;
     CFE_TIME_Global.ExternalCount            = 0;
@@ -1279,7 +1279,7 @@ void Test_External(void)
     /* Test setting time data from Time (external source, state set) */
     UT_InitData();
     CFE_TIME_Global.ClockSource                              = CFE_TIME_SourceSelect_EXTERNAL;
-    CFE_TIME_Global.ReferenceState[0].ClockSetState          = CFE_TIME_SetState_WAS_SET;
+    CFE_TIME_Global.ReferenceState[0].ClockSetState          = CFE_TIME_SetState_NOT_SET;
     settime.Seconds                                          = 10;
     settime.Subseconds                                       = 0;
     CFE_TIME_Global.ExternalCount                            = 0;