diff --git a/test/unittest/osal/osal_all_test.c b/test/unittest/osal/osal_all_test.c index 75d9d487e94eaf771321a979cf6c0ea97e073420..4dc1116c950f03b7a93139b8680caf946b97e00e 100644 --- a/test/unittest/osal/osal_all_test.c +++ b/test/unittest/osal/osal_all_test.c @@ -546,7 +546,7 @@ void OsaThreadTest1(void) int32_t ret; (void)memset_s(&threadCfg, sizeof(threadCfg), 0, sizeof(threadCfg)); - threadCfg.name = "hdf_test"; + threadCfg.name = "hdf_test0"; threadCfg.priority = OSAL_THREAD_PRI_HIGH; threadCfg.stackSize = HDF_TEST_STACK_SIZE; ret = OsalThreadCreate(&thread, (OsalThreadEntry)ThreadTest, (void *)¶); @@ -567,7 +567,7 @@ void OsaThreadTest(void) UT_TEST_CHECK_RET(ret != HDF_SUCCESS, OSAL_SPIN_CREATE); (void)memset_s(&threadCfg, sizeof(threadCfg), 0, sizeof(threadCfg)); - threadCfg.name = "hdf_test"; + threadCfg.name = "hdf_test1"; threadCfg.priority = OSAL_THREAD_PRI_HIGH; threadCfg.stackSize = HDF_TEST_STACK_SIZE; ret = OsalThreadCreate(&thread1, (OsalThreadEntry)ThreadTest1, (void *)&g_test1Para); @@ -578,7 +578,7 @@ void OsaThreadTest(void) OsalMSleep(HDF_THREAD_TEST_SLEEP_S); (void)memset_s(&threadCfg, sizeof(threadCfg), 0, sizeof(threadCfg)); - threadCfg.name = "hdf_test"; + threadCfg.name = "hdf_test2"; threadCfg.priority = OSAL_THREAD_PRI_DEFAULT; threadCfg.stackSize = HDF_TEST_STACK_SIZE; ret = OsalThreadCreate(&thread2, (OsalThreadEntry)ThreadTest2, (void *)&g_test2Para); diff --git a/test/unittest/osal/osal_list_test.c b/test/unittest/osal/osal_list_test.c index d6ff57f9d58bee6734d887f25f97c954f2681341..69227dcdbd02b6386be41fe13271a9c2c572415d 100644 --- a/test/unittest/osal/osal_list_test.c +++ b/test/unittest/osal/osal_list_test.c @@ -274,6 +274,8 @@ static int ThreadTestPostSem(void *arg) cnt++; index++; } + OsalTestWorkEnd(); + OsalSemPost(&g_hdfSem); HDF_LOGE("%s exit", __func__); return 0; } @@ -339,14 +341,14 @@ static void OsalTestSem(void) UT_TEST_CHECK_RET(OsalSemInit(&g_hdfSem, 0) != HDF_SUCCESS, OSAL_SEM_CREATE); (void)memset_s(&threadCfg, sizeof(threadCfg), 0, sizeof(threadCfg)); - threadCfg.name = "hdf_test"; + threadCfg.name = "hdf_test_Post"; threadCfg.priority = OSAL_THREAD_PRI_LOW; threadCfg.stackSize = HDF_TEST_STACK_SIZE; ret = OsalThreadCreate(&g_threadPostSem, (OsalThreadEntry)ThreadTestPostSem, (void *)&g_threadPara); UT_TEST_CHECK_RET(ret != HDF_SUCCESS, OSAL_THREAD_CREATE); (void)memset_s(&threadCfg, sizeof(threadCfg), 0, sizeof(threadCfg)); - threadCfg.name = "hdf_test"; + threadCfg.name = "hdf_test_Wait"; threadCfg.priority = OSAL_THREAD_PRI_DEFAULT; threadCfg.stackSize = HDF_TEST_STACK_SIZE; ret = OsalThreadCreate(&g_threadWaitSem, (OsalThreadEntry)ThreadTestWaitSem, (void *)&g_threadPara); diff --git a/test/unittest/osal/osal_work_test.c b/test/unittest/osal/osal_work_test.c index 870624dcec6d329beae7fdc8ce0c593d67a334fa..8f9a5eba4c4d67fb1fbf21437701577e736907dc 100644 --- a/test/unittest/osal/osal_work_test.c +++ b/test/unittest/osal/osal_work_test.c @@ -215,3 +215,11 @@ void OsalTestWork(int flag) OsalTestFile(flag); } +void OsalTestWorkEnd(void) +{ + HdfCancelWorkSync(&g_work); + HdfWorkDestroy(&g_work); + HdfCancelDelayedWorkSync(&g_delayWork); + HdfDelayedWorkDestroy(&g_delayWork); + HdfWorkQueueDestroy(&g_workQue); +} \ No newline at end of file diff --git a/test/unittest/osal/osal_work_test.h b/test/unittest/osal/osal_work_test.h index daeea3fca9502db067ced07012eb0a2ddc859df0..d5e05a87e8d75114cdc60ec46115d7a5231f4a35 100644 --- a/test/unittest/osal/osal_work_test.h +++ b/test/unittest/osal/osal_work_test.h @@ -15,7 +15,7 @@ extern "C" { void OsalTestWork(int flag); void TestAddRoute(int cnt); - +void OsalTestWorkEnd(void); #ifdef __cplusplus } #endif /* __cplusplus */