diff --git a/testsuites/sample/cmsis/cmsis_func_test.c b/testsuites/sample/cmsis/cmsis_func_test.c index 56cfb255..4423987c 100644 --- a/testsuites/sample/cmsis/cmsis_func_test.c +++ b/testsuites/sample/cmsis/cmsis_func_test.c @@ -91,7 +91,6 @@ LITE_TEST_CASE(CmsisFuncTestSuite, TestCmsis007, Function | MediumTest | Level1) { osMessageQueueId_t msgQueueId; osMessageQueueAttr_t attr = {0}; - CHAR staticBuff[STATCI_BUFF_SIZE] = {0}; CHAR strbuff[] = "hello world"; CHAR *name = NULL; INT32 ret; @@ -112,6 +111,7 @@ LITE_TEST_CASE(CmsisFuncTestSuite, TestCmsis007, Function | MediumTest | Level1) ICUNIT_ASSERT_EQUAL(name, NULL, name); #if (LOSCFG_BASE_IPC_QUEUE_STATIC == 1) + CHAR staticBuff[STATCI_BUFF_SIZE] = {0}; attr.mq_mem = staticBuff; attr.mq_size = STATCI_BUFF_SIZE; msgQueueId = osMessageQueueNew(1, STATCI_BUFF_SIZE, &attr); @@ -239,8 +239,6 @@ LITE_TEST_CASE(CmsisFuncTestSuite, TestCmsis006, Function | MediumTest | Level1) LITE_TEST_CASE(CmsisFuncTestSuite, TestCmsis005, Function | MediumTest | Level1) { osMessageQueueId_t msgQueueId; - osMessageQueueAttr_t attr = {0}; - CHAR staticBuff[STATCI_BUFF_SIZE] = {0}; CHAR strbuff[] = "hello world"; CHAR data[STATCI_BUFF_SIZE] = {0}; INT32 ret; @@ -272,6 +270,8 @@ LITE_TEST_CASE(CmsisFuncTestSuite, TestCmsis005, Function | MediumTest | Level1) #if (LOSCFG_BASE_IPC_QUEUE_STATIC == 1) /* static test */ + osMessageQueueAttr_t attr = {0}; + CHAR staticBuff[STATCI_BUFF_SIZE] = {0}; attr.mq_mem = staticBuff; attr.mq_size = STATCI_BUFF_SIZE; msgQueueId = osMessageQueueNew(1, STATCI_BUFF_SIZE, &attr); @@ -311,8 +311,6 @@ EXIT: LITE_TEST_CASE(CmsisFuncTestSuite, TestCmsis004, Function | MediumTest | Level1) { osMessageQueueId_t msgQueueId; - osMessageQueueAttr_t attr = {0}; - CHAR staticBuff[STATCI_BUFF_SIZE] = {0}; CHAR strbuff[] = "hello world"; CHAR data[STATCI_BUFF_SIZE] = {0}; INT32 ret; @@ -335,6 +333,8 @@ LITE_TEST_CASE(CmsisFuncTestSuite, TestCmsis004, Function | MediumTest | Level1) #if (LOSCFG_BASE_IPC_QUEUE_STATIC == 1) /* static test */ + osMessageQueueAttr_t attr = {0}; + CHAR staticBuff[STATCI_BUFF_SIZE] = {0}; attr.mq_mem = staticBuff; attr.mq_size = strlen(strbuff) + 1; msgQueueId = osMessageQueueNew(1, strlen(strbuff), &attr); @@ -373,8 +373,6 @@ EXIT: LITE_TEST_CASE(CmsisFuncTestSuite, TestCmsis003, Function | MediumTest | Level1) { osMessageQueueId_t msgQueueId; - osMessageQueueAttr_t attr = {0}; - CHAR staticBuff[STATCI_BUFF_SIZE] = {0}; CHAR strbuff[] = "hello world"; /* dynmic test */ @@ -386,6 +384,8 @@ LITE_TEST_CASE(CmsisFuncTestSuite, TestCmsis003, Function | MediumTest | Level1) #if (LOSCFG_BASE_IPC_QUEUE_STATIC == 1) /* static test */ + osMessageQueueAttr_t attr = {0}; + CHAR staticBuff[STATCI_BUFF_SIZE] = {0}; attr.mq_mem = staticBuff; attr.mq_size = STATCI_BUFF_SIZE; msgQueueId = osMessageQueueNew(0, strlen(strbuff), &attr); @@ -417,8 +417,6 @@ LITE_TEST_CASE(CmsisFuncTestSuite, TestCmsis003, Function | MediumTest | Level1) LITE_TEST_CASE(CmsisFuncTestSuite, TestCmsis002, Function | MediumTest | Level1) { osMessageQueueId_t msgQueueId; - osMessageQueueAttr_t attr = {0}; - CHAR staticBuff[STATCI_BUFF_SIZE] = {0}; CHAR strbuff[] = "hello world"; INT32 ret; @@ -434,6 +432,8 @@ LITE_TEST_CASE(CmsisFuncTestSuite, TestCmsis002, Function | MediumTest | Level1) #if (LOSCFG_BASE_IPC_QUEUE_STATIC == 1) /* static test */ + osMessageQueueAttr_t attr = {0}; + CHAR staticBuff[STATCI_BUFF_SIZE] = {0}; attr.mq_mem = staticBuff; attr.mq_size = STATCI_BUFF_SIZE; msgQueueId = osMessageQueueNew(1, STATCI_BUFF_SIZE, &attr); diff --git a/testsuites/sample/kernel/atomic/it_los_atomic_010.c b/testsuites/sample/kernel/atomic/it_los_atomic_010.c index ea485481..ddcbd06d 100644 --- a/testsuites/sample/kernel/atomic/it_los_atomic_010.c +++ b/testsuites/sample/kernel/atomic/it_los_atomic_010.c @@ -62,9 +62,9 @@ static UINT32 TestCase(VOID) ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); LOS_TaskDelay(20); // delay 20 ticks. - ICUNIT_GOTO_EQUAL(g_testCount, 1, g_testCount, EXIT); - ICUNIT_GOTO_EQUAL(g_testAtomicID05, TEST_LOOP, g_testAtomicID05, EXIT); -EXIT: + ICUNIT_ASSERT_EQUAL(g_testCount, 1, g_testCount); + ICUNIT_ASSERT_EQUAL(g_testAtomicID05, TEST_LOOP, g_testAtomicID05); + return LOS_OK; } diff --git a/testsuites/sample/kernel/atomic/it_los_atomic_011.c b/testsuites/sample/kernel/atomic/it_los_atomic_011.c index 995c15f2..04dfc447 100644 --- a/testsuites/sample/kernel/atomic/it_los_atomic_011.c +++ b/testsuites/sample/kernel/atomic/it_los_atomic_011.c @@ -232,8 +232,8 @@ static UINT32 TestCase(VOID) ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); LOS_TaskDelay(20); // delay 20 ticks. - ICUNIT_GOTO_EQUAL(g_testCount, 1, g_testCount, EXIT); -EXIT: + ICUNIT_ASSERT_EQUAL(g_testCount, 1, g_testCount); + return LOS_OK; } diff --git a/testsuites/sample/kernel/dynlink/It_los_dynlink_005.c b/testsuites/sample/kernel/dynlink/It_los_dynlink_005.c index 353d6033..af3314ae 100644 --- a/testsuites/sample/kernel/dynlink/It_los_dynlink_005.c +++ b/testsuites/sample/kernel/dynlink/It_los_dynlink_005.c @@ -36,7 +36,6 @@ STATIC UINT32 TestCase(VOID) VOID *handle = NULL; CHAR *dsoNeedOthers = DSO_FULL_PATH("Align4_dynamic_need_others.so"); CHAR *dsoWithoutPIC = DSO_FULL_PATH("Align4_dynamic_nopic.so"); - INT32 ret; handle = (VOID *)LOS_SoLoad(dsoNeedOthers, NULL); ICUNIT_ASSERT_EQUAL(handle, NULL, handle); diff --git a/testsuites/sample/kernel/dynlink/It_los_dynlink_020.c b/testsuites/sample/kernel/dynlink/It_los_dynlink_020.c index f281992f..f4c4a788 100644 --- a/testsuites/sample/kernel/dynlink/It_los_dynlink_020.c +++ b/testsuites/sample/kernel/dynlink/It_los_dynlink_020.c @@ -36,7 +36,6 @@ STATIC UINT32 TestCase(VOID) VOID *handle = NULL; VOID (*func)(INT32, INT32) = NULL; CHAR *dsoName = DSO_FULL_PATH("Align4_dynamic_stdlib.so"); - INT32 ret; handle = (VOID *)LOS_SoLoad(dsoName, NULL); ICUNIT_ASSERT_EQUAL(handle, NULL, handle); diff --git a/testsuites/sample/kernel/event/It_los_event_008.c b/testsuites/sample/kernel/event/It_los_event_008.c index 4528279b..e9bdb954 100644 --- a/testsuites/sample/kernel/event/It_los_event_008.c +++ b/testsuites/sample/kernel/event/It_los_event_008.c @@ -74,7 +74,7 @@ static UINT32 Testcase(VOID) LOS_EventInit(&g_pevent); ret = LOS_TaskCreate(&g_testTaskID01, &task1); - ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); + ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); ICUNIT_GOTO_EQUAL(g_testCount, 3, g_testCount, EXIT); // 3, Here, assert that g_testCount is equal to 3. g_testCount++; @@ -84,7 +84,6 @@ static UINT32 Testcase(VOID) ICUNIT_GOTO_EQUAL(g_testCount, 4, g_testCount, EXIT1); // 4, Here, assert that g_testCount is equal to 4. EXIT1: - ret = LOS_EventClear(&g_pevent, 0); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); diff --git a/testsuites/sample/kernel/event/It_los_event_013.c b/testsuites/sample/kernel/event/It_los_event_013.c index 0201f498..34301d72 100644 --- a/testsuites/sample/kernel/event/It_los_event_013.c +++ b/testsuites/sample/kernel/event/It_los_event_013.c @@ -84,7 +84,7 @@ static UINT32 Testcase(VOID) LOS_EventInit(&g_pevent); ret = LOS_TaskCreate(&g_testTaskID01, &task1); - ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); + ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); ICUNIT_GOTO_EQUAL(g_testCount, 1, g_testCount, EXIT); g_testCount++; diff --git a/testsuites/sample/kernel/event/It_los_event_014.c b/testsuites/sample/kernel/event/It_los_event_014.c index 31b580da..4f242120 100644 --- a/testsuites/sample/kernel/event/It_los_event_014.c +++ b/testsuites/sample/kernel/event/It_los_event_014.c @@ -87,7 +87,7 @@ static UINT32 Testcase(VOID) ret = LOS_EventWrite(&g_pevent, 0x11); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT1); - ret = LOS_TaskResume(g_testTaskID01); + (VOID)LOS_TaskResume(g_testTaskID01); ICUNIT_GOTO_EQUAL(g_testCount, 5, g_testCount, EXIT1); // 5, Here, assert that g_testCount is equal to 5. EXIT1: diff --git a/testsuites/sample/kernel/event/It_los_event_019.c b/testsuites/sample/kernel/event/It_los_event_019.c index 77f3008c..ba9798ff 100644 --- a/testsuites/sample/kernel/event/It_los_event_019.c +++ b/testsuites/sample/kernel/event/It_los_event_019.c @@ -90,7 +90,7 @@ static UINT32 Testcase(VOID) LOS_EventInit(&g_pevent); ret = LOS_TaskCreate(&g_testTaskID01, &task1); - ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); + ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); ICUNIT_ASSERT_EQUAL(g_testCount, 1, g_testCount); g_testCount++; diff --git a/testsuites/sample/kernel/event/It_los_event_020.c b/testsuites/sample/kernel/event/It_los_event_020.c index d82ace50..2c814c12 100644 --- a/testsuites/sample/kernel/event/It_los_event_020.c +++ b/testsuites/sample/kernel/event/It_los_event_020.c @@ -88,7 +88,7 @@ static UINT32 Testcase(VOID) LOS_EventInit(&g_pevent); ret = LOS_TaskCreate(&g_testTaskID01, &task1); - ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); + ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); ICUNIT_ASSERT_EQUAL(g_testCount, 1, g_testCount); g_testCount++; diff --git a/testsuites/sample/kernel/event/It_los_event_021.c b/testsuites/sample/kernel/event/It_los_event_021.c index 2f1f4a8e..9b63a74a 100644 --- a/testsuites/sample/kernel/event/It_los_event_021.c +++ b/testsuites/sample/kernel/event/It_los_event_021.c @@ -85,13 +85,10 @@ static UINT32 Testcase(VOID) LOS_EventInit(&g_pevent); ret = LOS_TaskCreate(&g_testTaskID01, &task1); - ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); + ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); ICUNIT_ASSERT_EQUAL(g_testCount, 5, g_testCount); // 5, Here, assert that g_testCount is equal to 5. - return LOS_OK; - -EXIT: LOS_TaskDelete(g_testTaskID01); return LOS_OK; diff --git a/testsuites/sample/kernel/event/It_los_event_033.c b/testsuites/sample/kernel/event/It_los_event_033.c index c156779c..7fce10ba 100644 --- a/testsuites/sample/kernel/event/It_los_event_033.c +++ b/testsuites/sample/kernel/event/It_los_event_033.c @@ -129,14 +129,13 @@ static UINT32 Testcase(VOID) ICUNIT_GOTO_EQUAL(g_testCount, 3, g_testCount, EXIT2); // 3, Here, assert that g_testCount is equal to 3. - ret = LOS_EventWrite(&g_pevent, 0xF); + (VOID)LOS_EventWrite(&g_pevent, 0xF); LOS_TaskDelay(1); - ICUNIT_GOTO_EQUAL(g_testCount, 6, g_testCount, EXIT3); // 6, Here, assert that g_testCount is equal to 6. + ICUNIT_ASSERT_EQUAL(g_testCount, 6, g_testCount); // 6, Here, assert that g_testCount is equal to 6. -EXIT3: - ret = LOS_EventClear(&g_pevent, 0); + (VOID)LOS_EventClear(&g_pevent, 0); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); ret = LOS_EventDestroy(&g_pevent); diff --git a/testsuites/sample/kernel/event/It_los_event_037.c b/testsuites/sample/kernel/event/It_los_event_037.c index aa8b32df..e0ae6ec0 100644 --- a/testsuites/sample/kernel/event/It_los_event_037.c +++ b/testsuites/sample/kernel/event/It_los_event_037.c @@ -77,10 +77,9 @@ static UINT32 Testcase(VOID) LOS_EventClear(&g_pevent, (~(0x11))); - ret = LOS_TaskResume(g_testTaskID01); - ICUNIT_GOTO_EQUAL(g_testCount, 4, g_testCount, EXIT1); // 4, Here, assert that g_testCount is equal to 4. + (VOID)LOS_TaskResume(g_testTaskID01); + ICUNIT_ASSERT_EQUAL(g_testCount, 4, g_testCount); // 4, Here, assert that g_testCount is equal to 4. -EXIT1: ret = LOS_EventClear(&g_pevent, 0); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); diff --git a/testsuites/sample/kernel/lms/It_los_lms_024.c b/testsuites/sample/kernel/lms/It_los_lms_024.c index a2279638..9e5f0298 100644 --- a/testsuites/sample/kernel/lms/It_los_lms_024.c +++ b/testsuites/sample/kernel/lms/It_los_lms_024.c @@ -52,7 +52,7 @@ static UINT32 TestCase(VOID) ICUNIT_ASSERT_NOT_EQUAL(buf, NULL, buf); buf[7] = '\0'; /* end index 7 */ PRINTK("%d\n", __LINE__); - ret = strcpy_s(buf, 100, src); /* Check LMS detection information when the strcpy_s dest max set 100 overflows. */ + (VOID)strcpy_s(buf, 100, src); /* Check LMS detection information when the strcpy_s dest max set 100 overflows. */ PRINTK("%d\n", __LINE__); ret = LOS_MemFree(g_testLmsPool, buf); diff --git a/testsuites/sample/kernel/mux/It_los_mutex_009.c b/testsuites/sample/kernel/mux/It_los_mutex_009.c index 702c8f14..6737f559 100644 --- a/testsuites/sample/kernel/mux/It_los_mutex_009.c +++ b/testsuites/sample/kernel/mux/It_los_mutex_009.c @@ -59,7 +59,7 @@ static UINT32 Testcase(VOID) task.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; task.uwResved = 0; - ret = LOS_TaskCreate(&g_testTaskID01, &task); + (VOID)LOS_TaskCreate(&g_testTaskID01, &task); ICUNIT_ASSERT_EQUAL(g_testCount, 1, g_testCount); // 1, Here, assert that g_testCount is equal to 1. ret = LOS_MuxDelete(g_mutexTest); diff --git a/testsuites/sample/kernel/mux/It_los_mutex_011.c b/testsuites/sample/kernel/mux/It_los_mutex_011.c index 0fbde21b..998be8f2 100644 --- a/testsuites/sample/kernel/mux/It_los_mutex_011.c +++ b/testsuites/sample/kernel/mux/It_los_mutex_011.c @@ -68,7 +68,7 @@ static UINT32 Testcase(VOID) task.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; task.uwResved = 0; - ret = LOS_TaskCreate(&g_testTaskID01, &task); + (VOID)LOS_TaskCreate(&g_testTaskID01, &task); ICUNIT_ASSERT_EQUAL(g_testCount, 1, g_testCount); // 1, Here, assert that g_testCount is equal to 1. diff --git a/testsuites/sample/kernel/mux/It_los_mutex_014.c b/testsuites/sample/kernel/mux/It_los_mutex_014.c index 4d7c0312..cad164e6 100644 --- a/testsuites/sample/kernel/mux/It_los_mutex_014.c +++ b/testsuites/sample/kernel/mux/It_los_mutex_014.c @@ -70,7 +70,7 @@ static UINT32 Testcase(VOID) task.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; task.uwResved = 0; - ret = LOS_TaskCreate(&g_testTaskID01, &task); + (VOID)LOS_TaskCreate(&g_testTaskID01, &task); task2.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01; task2.usTaskPrio = (TASK_PRIO_TEST - 2); // 2, set new task priority, it is higher than the current task. diff --git a/testsuites/sample/kernel/sem/It_los_sem_019.c b/testsuites/sample/kernel/sem/It_los_sem_019.c index bfe14f03..171cdab3 100644 --- a/testsuites/sample/kernel/sem/It_los_sem_019.c +++ b/testsuites/sample/kernel/sem/It_los_sem_019.c @@ -68,7 +68,7 @@ static UINT32 Testcase(VOID) ICUNIT_GOTO_EQUAL(g_testCount, 2, g_testCount, EXIT); // 2, Here, assert that g_testCount is equal to 2. EXIT: - ret = LOS_TaskDelete(g_testTaskID01); + (VOID)LOS_TaskDelete(g_testTaskID01); EXIT2: ret = LOS_SemDelete(g_usSemID); diff --git a/testsuites/sample/kernel/swtmr/It_los_swtmr_076.c b/testsuites/sample/kernel/swtmr/It_los_swtmr_076.c index f061c618..ad802dbf 100644 --- a/testsuites/sample/kernel/swtmr/It_los_swtmr_076.c +++ b/testsuites/sample/kernel/swtmr/It_los_swtmr_076.c @@ -61,7 +61,7 @@ static UINT32 Testcase(VOID) ret = LOS_SwtmrStart(swTmrID); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); - ret = LOS_TaskDelay(10); // 10, set delay time. + (VOID)LOS_TaskDelay(10); // 10, set delay time. ICUNIT_GOTO_EQUAL(g_testCount, 1, g_testCount, EXIT); diff --git a/testsuites/sample/kernel/swtmr/It_los_swtmr_079.c b/testsuites/sample/kernel/swtmr/It_los_swtmr_079.c index 1168aa04..c3e6d225 100644 --- a/testsuites/sample/kernel/swtmr/It_los_swtmr_079.c +++ b/testsuites/sample/kernel/swtmr/It_los_swtmr_079.c @@ -88,7 +88,7 @@ static UINT32 Testcase(VOID) ret = LOS_SwtmrStart(g_swTmrID2); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); - ret = LOS_TaskDelay(10); // 10, set delay time. + (VOID)LOS_TaskDelay(10); // 10, set delay time. ICUNIT_GOTO_EQUAL(g_testCount, 1, g_testCount, EXIT); return LOS_OK; diff --git a/testsuites/sample/kernel/swtmr/It_los_swtmr_081.c b/testsuites/sample/kernel/swtmr/It_los_swtmr_081.c index 3edb6828..b420b35d 100644 --- a/testsuites/sample/kernel/swtmr/It_los_swtmr_081.c +++ b/testsuites/sample/kernel/swtmr/It_los_swtmr_081.c @@ -49,8 +49,6 @@ static UINT32 Testcase(VOID) { UINT32 ret; g_testCount1 = 0; - UINT64 tickRecord; - UINT64 tickUpdate; UINT64 deltaTicks; // 4, Timeout interval of a periodic software timer. diff --git a/testsuites/sample/kernel/task/It_los_task_039.c b/testsuites/sample/kernel/task/It_los_task_039.c index 0395c76b..de1a72e9 100644 --- a/testsuites/sample/kernel/task/It_los_task_039.c +++ b/testsuites/sample/kernel/task/It_los_task_039.c @@ -50,7 +50,6 @@ static UINT32 TestCase(VOID) task1.pfnTaskEntry = (TSK_ENTRY_FUNC)TaskF01; task1.uwStackSize = LOSCFG_BASE_CORE_TSK_MIN_STACK_SIZE; - task1.usTaskPrio = TASK_PRIO_TEST + 1; g_testCount = 0; LOS_TaskLock(); @@ -64,7 +63,6 @@ static UINT32 TestCase(VOID) ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); } - task1.usTaskPrio = index % OS_TASK_PRIORITY_LOWEST; task1.pcName = "TskA"; task1.uwResved = LOS_TASK_STATUS_DETACHED; ret = LOS_TaskCreate(&testTaskID[index], &task1); diff --git a/testsuites/sample/kernel/task/It_los_task_126.c b/testsuites/sample/kernel/task/It_los_task_126.c index 15629214..35599d96 100644 --- a/testsuites/sample/kernel/task/It_los_task_126.c +++ b/testsuites/sample/kernel/task/It_los_task_126.c @@ -46,10 +46,8 @@ static VOID TaskF01(UINT32 arg) static UINT32 TestCase(VOID) { UINT32 freeMem; - UINT32 freeMem1; UINT32 freeMem2; UINT32 freeMem3; - UINT32 freeMem4; UINT32 ret; TSK_INIT_PARAM_S task1 = { 0 }; @@ -66,7 +64,7 @@ static UINT32 TestCase(VOID) ICUNIT_ASSERT_EQUAL(g_testCount, 1, g_testCount); - freeMem1 = GetfreeMemSize(m_aucSysMem0); + (VOID)GetfreeMemSize(m_aucSysMem0); LOS_TaskDelay(10); // 10, task delay times. diff --git a/testsuites/sample/kernel/task/It_los_task_128.c b/testsuites/sample/kernel/task/It_los_task_128.c index 60396640..4098b969 100644 --- a/testsuites/sample/kernel/task/It_los_task_128.c +++ b/testsuites/sample/kernel/task/It_los_task_128.c @@ -55,7 +55,6 @@ static VOID TaskF01(VOID) static UINT32 TestCase(VOID) { UINT32 freeMem; - UINT32 freeMem1; UINT32 freeMem2; UINT32 ret; TSK_INIT_PARAM_S task1 = { 0 }; diff --git a/testsuites/sample/posix/pthread/It_posix_pthread_013.c b/testsuites/sample/posix/pthread/It_posix_pthread_013.c index 4c493c10..1f1637e0 100644 --- a/testsuites/sample/posix/pthread/It_posix_pthread_013.c +++ b/testsuites/sample/posix/pthread/It_posix_pthread_013.c @@ -59,7 +59,6 @@ EXIT: static VOID *PthreadF02(void *t) { - int i; int rc; ICUNIT_GOTO_EQUAL(g_testCount, 1, g_testCount, EXIT); diff --git a/testsuites/sample/posix/pthread/It_posix_pthread_014.c b/testsuites/sample/posix/pthread/It_posix_pthread_014.c index d7a764aa..b86f5fe0 100644 --- a/testsuites/sample/posix/pthread/It_posix_pthread_014.c +++ b/testsuites/sample/posix/pthread/It_posix_pthread_014.c @@ -33,8 +33,6 @@ static UINT32 Testcase(VOID) { pthread_condattr_t condattr; - pthread_cond_t cond1; - pthread_cond_t cond2; int pshared; int rc; diff --git a/testsuites/sample/posix/pthread_func_test.c b/testsuites/sample/posix/pthread_func_test.c index ba112acb..df0ba169 100644 --- a/testsuites/sample/posix/pthread_func_test.c +++ b/testsuites/sample/posix/pthread_func_test.c @@ -743,7 +743,6 @@ LITE_TEST_CASE(PthreadFuncTestSuite, TestPthread011, Function | MediumTest | Lev pthread_t thread; struct sched_param schedParam = { 0 }; UINT32 ret; - pthread_once_t onceControl = 0; g_testCount = 0; ret = pthread_attr_init(&attr); ICUNIT_ASSERT_EQUAL(ret, 0, ret); @@ -804,7 +803,6 @@ LITE_TEST_CASE(PthreadFuncTestSuite, TestPthread012, Function | MediumTest | Lev pthread_t thread; struct sched_param schedParam = { 0 }; UINT32 ret; - pthread_once_t onceControl = 0; g_testCount = 0; g_pthreadSem = 0; diff --git a/testsuites/unittest/fuzz/src/regex/it_test_regex_fuzz.c b/testsuites/unittest/fuzz/src/regex/it_test_regex_fuzz.c index 7c96edb1..0a44382b 100644 --- a/testsuites/unittest/fuzz/src/regex/it_test_regex_fuzz.c +++ b/testsuites/unittest/fuzz/src/regex/it_test_regex_fuzz.c @@ -45,7 +45,6 @@ extern int g_iteration; static uint32_t RegexFuzz(void) { - int fd; int ret; regex_t preg; regmatch_t pmatch[1]; @@ -56,7 +55,6 @@ static uint32_t RegexFuzz(void) const int maxStrLen = 5; const int maxNumRange = 6; const int maxNum1Range = 3; - int spid; int num; int num1; char *string1 = NULL; diff --git a/testsuites/unittest/fuzz/src/semaphore/sem_timedwait_fuzz.c b/testsuites/unittest/fuzz/src/semaphore/sem_timedwait_fuzz.c index 9695f989..4b9cba78 100644 --- a/testsuites/unittest/fuzz/src/semaphore/sem_timedwait_fuzz.c +++ b/testsuites/unittest/fuzz/src/semaphore/sem_timedwait_fuzz.c @@ -52,7 +52,7 @@ void SemTimedWaitFuzzTest(void) const int elemNsecIndex = 5; struct timespec absTimeout; sem_t sem; - int pshared, value, getvalue; + int pshared, value; printf("Fuzz test in line [%d] sem_timedwait start\n", __LINE__); diff --git a/testsuites/unittest/fuzz/src/socket/net_fuzz.c b/testsuites/unittest/fuzz/src/socket/net_fuzz.c index 76804964..b4d49f7e 100644 --- a/testsuites/unittest/fuzz/src/socket/net_fuzz.c +++ b/testsuites/unittest/fuzz/src/socket/net_fuzz.c @@ -71,7 +71,6 @@ static void *SampleUdpServer() struct sockaddr_in clnAddr = { 0 }; socklen_t clnAddrLen = sizeof(clnAddr); char buf[BUF_SIZE] = { 0 }; - int flag; struct msghdr msg = { 0 }; struct iovec iov[2] = { }; @@ -134,7 +133,6 @@ static void *SampleUdpClient() msg.msg_iov = iov; msg.msg_iovlen = 1; iov[0].iov_base = buf; - iov[0].iov_len = sizeof(buf); (void)recvmsg(fd, &msg, 0x40); printf("c6\r\n"); @@ -150,7 +148,6 @@ static UINT32 UdpFun(VOID) UINT8 num2; UINT8 num3; UINT8 num4; - UINT8 num5; INIT_FuzzEnvironment(); printf("UDPFun starts\n"); @@ -160,7 +157,6 @@ static UINT32 UdpFun(VOID) num2 = *(UINT8 *)DT_SetGetU8(&g_element[NUM_1_INDEX], 1); num3 = *(UINT8 *)DT_SetGetU8(&g_element[NUM_2_INDEX], 1); num4 = *(UINT8 *)DT_SetGetU8(&g_element[NUM_3_INDEX], 1); - num5 = *(UINT8 *)DT_SetGetU8(&g_element[NUM_4_INDEX], 1); (void)snprintf_s(g_udpIp, sizeof(g_udpIp), sizeof(g_udpIp) - 1, "%d.%d.%d.%d", num1, num2, num3, num4); g_udpPort = *(UINT16 *)DT_SetGetU16(&g_element[NUM_5_INDEX], 0); @@ -244,7 +240,6 @@ static void *SampleTcpClient() char buf[BUF_SIZE + 1] = { 0 }; int sfd = -1; struct sockaddr_in srvAddr = { 0 }; - struct sockaddr_in clnAddr = { 0 }; int ret; struct sockaddr addr; diff --git a/testsuites/unittest/fuzz/src/stdlib/strtoull_fuzz.c b/testsuites/unittest/fuzz/src/stdlib/strtoull_fuzz.c index 26444de0..0f932ab8 100644 --- a/testsuites/unittest/fuzz/src/stdlib/strtoull_fuzz.c +++ b/testsuites/unittest/fuzz/src/stdlib/strtoull_fuzz.c @@ -48,7 +48,7 @@ extern int g_iteration; void StrtoullFuzzTest(void) { - int base = DEFAULT_BASE_VALUE; + int base; char *str = NULL; char *endPtr = NULL; diff --git a/testsuites/unittest/posix/src/fs/posix_fs_func_test.c b/testsuites/unittest/posix/src/fs/posix_fs_func_test.c index 66021747..c3754ab4 100644 --- a/testsuites/unittest/posix/src/fs/posix_fs_func_test.c +++ b/testsuites/unittest/posix/src/fs/posix_fs_func_test.c @@ -241,7 +241,6 @@ LITE_TEST_CASE(PosixFsFuncTestSuite, testFsFopenFclose004, Function | MediumTest */ LITE_TEST_CASE(PosixFsFuncTestSuite, testFsFopenFclose005, Function | MediumTest | Level1) { - int ret = 0; FILE *fp = NULL; fp = fopen(TEST_FILE_PTAH_RIGHT, "c"); TEST_ASSERT_NULL(fp); @@ -350,7 +349,6 @@ LITE_TEST_CASE(PosixFsFuncTestSuite, testFsFopenFclose010, Function | MediumTest */ LITE_TEST_CASE(PosixFsFuncTestSuite, testFsFopenFclose011, Function | MediumTest | Level1) { - int ret = 0; FILE *fp = NULL; fp = fopen(TEST_FILE_PTAH_RIGHT, NULL); @@ -660,7 +658,7 @@ LITE_TEST_CASE(PosixFsFuncTestSuite, testFsFtellFseek008, Function | MediumTest */ LITE_TEST_CASE(PosixFsFuncTestSuite, testFsFtellFseek009, Function | MediumTest | Level1) { - int ret = 0; + int ret; FILE *fp = NULL; long off = 0; @@ -884,7 +882,6 @@ LITE_TEST_CASE(PosixFsFuncTestSuite, testFsFputs001, Function | MediumTest | Lev int ret = 0; FILE *fp = NULL; const char chr1[TEST_BUF_SIZE] = "hello"; - char str[TEST_BUF_SIZE] = {0}; fp = fopen(TEST_FILE_PTAH_RIGHT, "w"); TEST_ASSERT_NOT_NULL(fp); @@ -907,7 +904,6 @@ LITE_TEST_CASE(PosixFsFuncTestSuite, testFsFputs002, Function | MediumTest | Lev int ret = 0; FILE *fp = NULL; const char chr1[TEST_BUF_SIZE] = "hello"; - char str[TEST_BUF_SIZE] = {0}; fp = fopen(TEST_FILE_PTAH_RIGHT, "a"); TEST_ASSERT_NOT_NULL(fp); @@ -930,7 +926,6 @@ LITE_TEST_CASE(PosixFsFuncTestSuite, testFsFputs003, Function | MediumTest | Lev int ret = 0; FILE *fp = NULL; const char chr1[TEST_BUF_SIZE] = "hello"; - char str[TEST_BUF_SIZE] = {0}; fp = fopen(TEST_FILE_PTAH_RIGHT, "w+"); TEST_ASSERT_NOT_NULL(fp); @@ -983,7 +978,6 @@ LITE_TEST_CASE(PosixFsFuncTestSuite, testFsFputs005, Function | MediumTest | Lev int ret = 0; FILE *fp = NULL; const char chr1[TEST_BUF_SIZE] = "hello"; - char str[TEST_BUF_SIZE] = {0}; int i; fp = fopen(TEST_FILE_PTAH_RIGHT, "w+"); @@ -1011,12 +1005,8 @@ LITE_TEST_CASE(PosixFsFuncTestSuite, testFsFreadFwrite001, Function | MediumTest { int ret = 0; FILE *fp = NULL; - long off = 0; const char chr1[TEST_BUF_SIZE] = "hello"; - const char chr2[TEST_BUF_SIZE] = "world"; - - char str[TEST_BUF_SIZE] = {0}; fp = fopen(TEST_FILE_PTAH_RIGHT, "w"); TEST_ASSERT_NOT_NULL(fp); @@ -1038,12 +1028,6 @@ LITE_TEST_CASE(PosixFsFuncTestSuite, testFsFreadFwrite002, Function | MediumTest { int ret = 0; FILE *fp = NULL; - long off = 0; - - const char chr1[TEST_BUF_SIZE] = "hello"; - const char chr2[TEST_BUF_SIZE] = "world"; - - char str[TEST_BUF_SIZE] = {0}; fp = fopen(TEST_FILE_PTAH_RIGHT, "w"); TEST_ASSERT_NOT_NULL(fp); @@ -1065,12 +1049,8 @@ LITE_TEST_CASE(PosixFsFuncTestSuite, testFsFreadFwrite003, Function | MediumTest { int ret = 0; FILE *fp = NULL; - long off = 0; const char chr1[TEST_BUF_SIZE] = "hello"; - const char chr2[TEST_BUF_SIZE] = "world"; - - char str[TEST_BUF_SIZE] = {0}; fp = fopen(TEST_FILE_PTAH_RIGHT, "r"); TEST_ASSERT_NOT_NULL(fp); @@ -1092,12 +1072,6 @@ LITE_TEST_CASE(PosixFsFuncTestSuite, testFsFreadFwrite004, Function | MediumTest { int ret = 0; FILE *fp = NULL; - long off = 0; - - const char chr1[TEST_BUF_SIZE] = "hello"; - const char chr2[TEST_BUF_SIZE] = "world"; - - char str[TEST_BUF_SIZE] = {0}; fp = fopen(TEST_FILE_PTAH_RIGHT, "r"); TEST_ASSERT_NOT_NULL(fp); @@ -1119,12 +1093,8 @@ LITE_TEST_CASE(PosixFsFuncTestSuite, testFsFreadFwrite005, Function | MediumTest { int ret = 0; FILE *fp = NULL; - long off = 0; const char chr1[TEST_BUF_SIZE] = "hello"; - const char chr2[TEST_BUF_SIZE] = "world"; - - char str[TEST_BUF_SIZE] = {0}; fp = fopen(TEST_FILE_PTAH_RIGHT, "a"); TEST_ASSERT_NOT_NULL(fp); @@ -1146,7 +1116,6 @@ LITE_TEST_CASE(PosixFsFuncTestSuite, testFsFreadFwrite006, Function | MediumTest { int ret = 0; FILE *fp = NULL; - long off = 0; const char chr1[TEST_BUF_SIZE] = "hello"; const char chr2[TEST_BUF_SIZE] = "world"; @@ -1189,7 +1158,6 @@ LITE_TEST_CASE(PosixFsFuncTestSuite, testFsFreadFwrite007, Function | MediumTest { int ret = 0; FILE *fp = NULL; - long off = 0; const char chr1[TEST_BUF_SIZE] = "hello"; const char chr2[TEST_BUF_SIZE] = "world"; @@ -1330,7 +1298,7 @@ LITE_TEST_CASE(PosixFsFuncTestSuite, testFsReaddir002, Function | MediumTest | L struct dirent *dResult; off_t tellDir0; off_t tellDir1; - int ret = 0; + int ret; ret = mkdir(DIRA, 0777); dirp = opendir((DIRA)); @@ -1359,7 +1327,7 @@ LITE_TEST_CASE(PosixFsFuncTestSuite, testFsReaddir002, Function | MediumTest | L LITE_TEST_CASE(PosixFsFuncTestSuite, testFsRemove001, Function | MediumTest | Level1) { FILE *fp = NULL; - int ret = 0; + int ret; fp = fopen(TEST_FILE_PTAH_RIGHT, "w"); fclose(fp); @@ -1375,7 +1343,7 @@ LITE_TEST_CASE(PosixFsFuncTestSuite, testFsRemove001, Function | MediumTest | Le */ LITE_TEST_CASE(PosixFsFuncTestSuite, testFsRemove002, Function | MediumTest | Level1) { - int ret = 0; + int ret; ret = mkdir(DIRA, 0777); TEST_ASSERT_EQUAL_INT(ret, 0); diff --git a/testsuites/unittest/posix/src/pthread/pthread_cond_func_test.c b/testsuites/unittest/posix/src/pthread/pthread_cond_func_test.c index 4d180ead..27cb8477 100644 --- a/testsuites/unittest/posix/src/pthread/pthread_cond_func_test.c +++ b/testsuites/unittest/posix/src/pthread/pthread_cond_func_test.c @@ -765,7 +765,6 @@ LITE_TEST_CASE(PthreadFuncTestSuite, testPthread011, Function | MediumTest | Lev pthread_t thread; struct sched_param schedParam = { 0 }; UINT32 ret; - pthread_once_t onceControl = 0; g_testCount = 0; ret = pthread_attr_init(&attr); ICUNIT_ASSERT_EQUAL(ret, 0, ret); @@ -825,7 +824,6 @@ LITE_TEST_CASE(PthreadFuncTestSuite, testPthread012, Function | MediumTest | Lev pthread_t thread; struct sched_param schedParam = { 0 }; UINT32 ret; - pthread_once_t onceControl = 0; g_testCount = 0; g_pthreadSem = 0; diff --git a/testsuites/unittest/posix/src/semaphore/semaphore_func_test.c b/testsuites/unittest/posix/src/semaphore/semaphore_func_test.c index d34f1f99..6024c792 100644 --- a/testsuites/unittest/posix/src/semaphore/semaphore_func_test.c +++ b/testsuites/unittest/posix/src/semaphore/semaphore_func_test.c @@ -105,7 +105,6 @@ LITE_TEST_CASE(PosixSemaphoreFuncTestSuite, testIpcSem_Timedwait001, Function | struct timespec ts = { 0 }; struct timespec tsNow = { 0 }; sem_t sem; - int semValue = 0; TEST_ASSERT_EQUAL_INT(0, sem_init((sem_t *)&sem, 0, 0)); @@ -138,7 +137,6 @@ LITE_TEST_CASE(PosixSemaphoreFuncTestSuite, testIpcSem_Timedwait002, Function | struct timespec tsNow = { 0 }; struct timespec tsBegin = { 0 }; sem_t sem; - int semValue = 0; TEST_ASSERT_EQUAL_INT(0, sem_init((sem_t *)&sem, 0, 1));