Merge pull request nasa#1405 from jphickey/fix-1404-condvar-test

Fix nasa#1404, skip condvar tests if not implemented
aris-space · Aug 18, 2023 · 99e3b40 · 99e3b40
2 parents f11fc4d + 6d1ef70
commit 99e3b40
Showing 1 changed file with 27 additions and 6 deletions.
diff --git a/src/tests/condvar-test/condvar-test.c b/src/tests/condvar-test/condvar-test.c
@@ -366,6 +366,20 @@ void CondVarTest_Ops(void)
     }
 }
 
+bool CondVarTest_CheckImpl(void)
+{
+    int32_t   status;
+    osal_id_t cvid;
+
+    status = OS_CondVarCreate(&cvid, "ut", 0);
+    if (status == OS_SUCCESS)
+    {
+        OS_CondVarDelete(cvid);
+    }
+
+    return (status != OS_ERR_NOT_IMPLEMENTED);
+}
+
 void UtTest_Setup(void)
 {
     if (OS_API_Init() != OS_SUCCESS)
@@ -376,10 +390,17 @@ void UtTest_Setup(void)
     /* the test should call OS_API_Teardown() before exiting */
     UtTest_AddTeardown(OS_API_Teardown, "Cleanup");
 
-    /*
-     * Register the test setup and check routines in UT assert
-     */
-    UtTest_Add(CondVarTest_Ops, NULL, NULL, "CondVarOps");
-    UtTest_Add(CondVarTest_Execute, CondVarTest_Setup, CondVarTest_Teardown, "CondVarBasic");
-    UtTest_Add(CondVarTimedWait_Execute, CondVarTimedWait_Setup, CondVarTimedWait_Teardown, "CondVarTimed");
+    if (CondVarTest_CheckImpl())
+    {
+        /*
+         * Register the test setup and check routines in UT assert
+         */
+        UtTest_Add(CondVarTest_Ops, NULL, NULL, "CondVarOps");
+        UtTest_Add(CondVarTest_Execute, CondVarTest_Setup, CondVarTest_Teardown, "CondVarBasic");
+        UtTest_Add(CondVarTimedWait_Execute, CondVarTimedWait_Setup, CondVarTimedWait_Teardown, "CondVarTimed");
+    }
+    else
+    {
+        UtAssert_MIR("Condition variables not implemented; skipping tests");
+    }
 }