From 2806c4af756533e2ad260d4a42ba2a0c2623617d Mon Sep 17 00:00:00 2001 From: liuwenxin Date: Thu, 10 Nov 2022 14:55:29 +0800 Subject: [PATCH] =?UTF-8?q?Fix:m=E6=A0=B8=E5=91=8A=E8=AD=A6=E6=B8=85?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: liuwenxin --- testsuites/sample/kernel/event/It_los_event_019.c | 1 - testsuites/sample/kernel/event/It_los_event_020.c | 1 - testsuites/sample/kernel/hwi/llt_los_hwi_035.c | 2 +- testsuites/sample/kernel/swtmr/It_los_swtmr.h | 2 +- testsuites/sample/kernel/swtmr/It_los_swtmr_030.c | 2 +- testsuites/sample/kernel/swtmr/It_los_swtmr_034.c | 4 ++-- testsuites/sample/kernel/swtmr/It_los_swtmr_040.c | 2 +- testsuites/sample/kernel/swtmr/It_los_swtmr_041.c | 2 +- testsuites/sample/kernel/swtmr/It_los_swtmr_043.c | 2 +- testsuites/sample/kernel/task/It_los_task_128.c | 3 --- testsuites/sample/posix/pthread/It_posix_pthread.c | 2 +- testsuites/unittest/posix/src/string/string_func_test_01.c | 2 ++ testsuites/unittest/posix/src/string/string_func_test_02.c | 2 ++ 13 files changed, 13 insertions(+), 14 deletions(-) diff --git a/testsuites/sample/kernel/event/It_los_event_019.c b/testsuites/sample/kernel/event/It_los_event_019.c index ba9798ff..d04d80c6 100644 --- a/testsuites/sample/kernel/event/It_los_event_019.c +++ b/testsuites/sample/kernel/event/It_los_event_019.c @@ -111,7 +111,6 @@ static UINT32 Testcase(VOID) EXIT1: LOS_TaskDelete(g_testTaskID02); -EXIT: LOS_TaskDelete(g_testTaskID01); return LOS_OK; diff --git a/testsuites/sample/kernel/event/It_los_event_020.c b/testsuites/sample/kernel/event/It_los_event_020.c index 2c814c12..b856817b 100644 --- a/testsuites/sample/kernel/event/It_los_event_020.c +++ b/testsuites/sample/kernel/event/It_los_event_020.c @@ -106,7 +106,6 @@ static UINT32 Testcase(VOID) EXIT1: LOS_TaskDelete(g_testTaskID02); -EXIT: LOS_TaskDelete(g_testTaskID01); return LOS_OK; diff --git a/testsuites/sample/kernel/hwi/llt_los_hwi_035.c b/testsuites/sample/kernel/hwi/llt_los_hwi_035.c index 3adfec9d..85ee1c3e 100644 --- a/testsuites/sample/kernel/hwi/llt_los_hwi_035.c +++ b/testsuites/sample/kernel/hwi/llt_los_hwi_035.c @@ -37,7 +37,7 @@ static VOID TaskF01(VOID) { } -VOID ItHwiM3B001F001() +static VOID ItHwiM3B001F001(VOID) { return; } diff --git a/testsuites/sample/kernel/swtmr/It_los_swtmr.h b/testsuites/sample/kernel/swtmr/It_los_swtmr.h index 3fba7707..a4416cad 100644 --- a/testsuites/sample/kernel/swtmr/It_los_swtmr.h +++ b/testsuites/sample/kernel/swtmr/It_los_swtmr.h @@ -69,7 +69,7 @@ static UINT32 g_uwsTick2; static UINT32 g_uwsTick3; extern VOID LOS_GetCpuTick(UINT32 *puwCntHi, UINT32 *puwCntLo); -extern VOID ItSuiteLosSwtmr(); +extern VOID ItSuiteLosSwtmr(VOID); extern VOID ItLosSwtmr001(VOID); extern VOID ItLosSwtmr002(VOID); extern VOID ItLosSwtmr003(VOID); diff --git a/testsuites/sample/kernel/swtmr/It_los_swtmr_030.c b/testsuites/sample/kernel/swtmr/It_los_swtmr_030.c index 36589785..a6b63c77 100644 --- a/testsuites/sample/kernel/swtmr/It_los_swtmr_030.c +++ b/testsuites/sample/kernel/swtmr/It_los_swtmr_030.c @@ -39,7 +39,7 @@ static VOID Case1(UINT32 arg) g_testCount++; } -static VOID Case2() +static VOID Case2(VOID) { g_testCount++; } diff --git a/testsuites/sample/kernel/swtmr/It_los_swtmr_034.c b/testsuites/sample/kernel/swtmr/It_los_swtmr_034.c index 6f83ff45..e9331350 100644 --- a/testsuites/sample/kernel/swtmr/It_los_swtmr_034.c +++ b/testsuites/sample/kernel/swtmr/It_los_swtmr_034.c @@ -44,12 +44,12 @@ static VOID Case1(UINT32 arg) g_testCount++; } -static VOID Case2() +static VOID Case2(VOID) { g_testCount++; } -static VOID Case3() +static VOID Case3(VOID) { g_testCount++; } diff --git a/testsuites/sample/kernel/swtmr/It_los_swtmr_040.c b/testsuites/sample/kernel/swtmr/It_los_swtmr_040.c index affeaa95..1ff43133 100644 --- a/testsuites/sample/kernel/swtmr/It_los_swtmr_040.c +++ b/testsuites/sample/kernel/swtmr/It_los_swtmr_040.c @@ -34,7 +34,7 @@ static UINT32 g_testCount1 = 0; -static VOID Case1() +static VOID Case1(VOID) { UINT32 ret; diff --git a/testsuites/sample/kernel/swtmr/It_los_swtmr_041.c b/testsuites/sample/kernel/swtmr/It_los_swtmr_041.c index 1f0c850f..889b0c75 100644 --- a/testsuites/sample/kernel/swtmr/It_los_swtmr_041.c +++ b/testsuites/sample/kernel/swtmr/It_los_swtmr_041.c @@ -35,7 +35,7 @@ static UINT32 g_testCount1 = 0; -static VOID Case1() +static VOID Case1(VOID) { UINT32 ret; diff --git a/testsuites/sample/kernel/swtmr/It_los_swtmr_043.c b/testsuites/sample/kernel/swtmr/It_los_swtmr_043.c index dcf7e487..8032a78d 100644 --- a/testsuites/sample/kernel/swtmr/It_los_swtmr_043.c +++ b/testsuites/sample/kernel/swtmr/It_los_swtmr_043.c @@ -44,7 +44,7 @@ static VOID Case1(UINT32 arg) return; } -static VOID Case2() +static VOID Case2(VOID) { UINT32 ret; UINT32 tick; diff --git a/testsuites/sample/kernel/task/It_los_task_128.c b/testsuites/sample/kernel/task/It_los_task_128.c index 4098b969..0a0eb096 100644 --- a/testsuites/sample/kernel/task/It_los_task_128.c +++ b/testsuites/sample/kernel/task/It_los_task_128.c @@ -32,9 +32,6 @@ #include "osTest.h" #include "It_los_task.h" -static UINT32 g_freeMem1 = 0; -static UINT32 g_freeMem2 = 0; - static UINT32 GetfreeMemSize(void *pool) { return LOS_MemPoolSizeGet(pool) - LOS_MemTotalUsedGet(pool); diff --git a/testsuites/sample/posix/pthread/It_posix_pthread.c b/testsuites/sample/posix/pthread/It_posix_pthread.c index fa15677e..db88d229 100644 --- a/testsuites/sample/posix/pthread/It_posix_pthread.c +++ b/testsuites/sample/posix/pthread/It_posix_pthread.c @@ -43,7 +43,7 @@ pthread_t TestPthreadSelf(void) return tid; } -VOID ItSuitePosixPthread() +void ItSuitePosixPthread(void) { printf("************** begin SAMPLE POSIX pthread test *************\n"); ItPosixPthread001(); diff --git a/testsuites/unittest/posix/src/string/string_func_test_01.c b/testsuites/unittest/posix/src/string/string_func_test_01.c index dd9d8b00..c5735900 100644 --- a/testsuites/unittest/posix/src/string/string_func_test_01.c +++ b/testsuites/unittest/posix/src/string/string_func_test_01.c @@ -33,6 +33,8 @@ #include "los_config.h" #include "kernel_test.h" #include "log.h" +#include +#include #define RET_OK 0 diff --git a/testsuites/unittest/posix/src/string/string_func_test_02.c b/testsuites/unittest/posix/src/string/string_func_test_02.c index 915a1af3..f338cfb4 100644 --- a/testsuites/unittest/posix/src/string/string_func_test_02.c +++ b/testsuites/unittest/posix/src/string/string_func_test_02.c @@ -34,6 +34,8 @@ #include "los_config.h" #include "kernel_test.h" #include "log.h" +#include +#include #define EQUAL 0