Merge pull request nasa#2429 from nasa/integration-candidate

cFE Integration candidate: Caelum-rc4+dev55
jphickey · Aug 18, 2023 · d018aa6 · d018aa6
2 parents 487edfd + 6c4d587
commit d018aa6
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## Development Build: v7.0.0-rc4+dev366
+- 'Fix #2427, Race condition in TestCreateChild'
+- See: <https://github.com/nasa/cFE/pull/2428>
+
+
 ## Development Build: v7.0.0-rc4+dev362
 - 'Fix #2421, adjust dependencies on table lib'
 - 'Fix #2423, avoid use of abspath make function'
@@ -115,6 +120,11 @@
 ## Development Build: v7.0.0-rc4+dev197
 - Remove # Changelog
 
+## Development Build: v7.0.0-rc4+dev366
+- 'Fix #2427, Race condition in TestCreateChild'
+- See: <https://github.com/nasa/cFE/pull/2428>
+
+
 ## Development Build: v7.0.0-rc4+dev362
 - 'Fix #2421, adjust dependencies on table lib'
 - 'Fix #2423, avoid use of abspath make function'

diff --git a/modules/cfe_testcase/src/es_task_test.c b/modules/cfe_testcase/src/es_task_test.c
@@ -101,6 +101,7 @@ void TestCreateChild(void)
     size_t                     StackSize     = CFE_PLATFORM_ES_PERF_CHILD_STACK_SIZE;
     CFE_ES_TaskPriority_Atom_t Priority      = CFE_PLATFORM_ES_PERF_CHILD_PRIORITY;
     uint32                     Flags         = 0;
+    uint32                     Index         = 0;
     int32                      ExpectedCount = 5;
     int32                      RetryCount;
     char                       TaskNameBuf[16];
@@ -110,7 +111,11 @@ void TestCreateChild(void)
     CFE_FT_Global.Count = 0;
     UtAssert_INT32_EQ(CFE_ES_CreateChildTask(&TaskId, TaskName, TaskFunction, StackPointer, StackSize, Priority, Flags),
                       CFE_SUCCESS);
-    OS_TaskDelay(500);
+    while (CFE_FT_Global.Count != ExpectedCount && Index < 100)
+    {
+        OS_TaskDelay(10);
+        Index ++;
+    }
 
     UtAssert_INT32_GT(CFE_FT_Global.Count, ExpectedCount - 1);
     UtAssert_INT32_LT(CFE_FT_Global.Count, ExpectedCount + 1);

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   362 /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */
+#define CFE_BUILD_NUMBER   366 /**< @brief Development: Number of development git commits since CFE_BUILD_BASELINE */
 #define CFE_BUILD_BASELINE "v7.0.0-rc4" /**< @brief Development: Reference git tag for build number */
 
 /* See \ref cfsversions for definitions */