From 9ca65adf320b8942caf67e4f9b3e4a480c9b7f15 Mon Sep 17 00:00:00 2001 From: zhushengle Date: Thu, 16 Sep 2021 20:37:34 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E7=94=A8=E4=BE=8B=E5=AF=BC=E8=87=B4=E7=B3=BB=E7=BB=9F=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E5=8F=8A=E4=B8=AD=E6=96=AD=E7=94=A8=E4=BE=8B=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1.系统异常 任务栈过小，导致踩内存 2.中断测试用例失败 shell占用了测试用例的中断号，导致创建中断失败 Close #I4AENS Signed-off-by: zhushengle Change-Id: I35512a5634aed328561c760ba6fcce4ec944aa2e --- testsuits/include/osTest.h | 4 ++-- testsuits/sample/kernel/hwi/it_los_hwi_005.c | 8 ++++---- testsuits/sample/kernel/hwi/it_los_hwi_032.c | 1 + testsuits/sample/kernel/hwi/it_los_hwi_033.c | 8 ++++---- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/testsuits/include/osTest.h b/testsuits/include/osTest.h index 64c9ae1a..284571ff 100644 --- a/testsuits/include/osTest.h +++ b/testsuits/include/osTest.h @@ -199,7 +199,6 @@ extern EVENT_CB_S g_exampleEvent; #define TASK_PRIO_TEST 25 #define TASK_PRIO_TEST_NORMAL 20 -#define TASK_STACK_SIZE_TEST 0x400 #define TASK_LOOP_NUM 0x100000 #define QUEUE_LOOP_NUM 100 #define HWI_LOOP_NUM 100 @@ -208,7 +207,6 @@ extern EVENT_CB_S g_exampleEvent; #define TEST_TASK_RUNTIME 0x100000 #define TEST_SWTMR_RUNTIME 0x1000000 #define TEST_HWI_RUNTIME 0x100000 -#define TEST_TASK_STACK_SIZE LOSCFG_BASE_CORE_TSK_MIN_STACK_SIZE #define TEST_TASK_PRIORITY_LOW osPriorityBelowNormal // tskIDLE_PRIORITY + 10 #define TEST_TASK_PRIORITY_NORMAL osPriorityNormal // tskIDLE_PRIORITY + 11 #define TEST_TASK_PRIORITY_HIGH osPriorityAboveNormal // tskIDLE_PRIORITY + 12 @@ -226,6 +224,8 @@ extern EVENT_CB_S g_exampleEvent; #else #define OS_TSK_TEST_STACK_SIZE 0x1000 #endif +#define TASK_STACK_SIZE_TEST OS_TSK_TEST_STACK_SIZE +#define TEST_TASK_STACK_SIZE OS_TSK_TEST_STACK_SIZE #define TASK_CMSIS_STACK_SIZE_TEST 0x600 #define OS_EVENT_TIMEOUT_MAX_VAL 0xFFFFFFFF diff --git a/testsuits/sample/kernel/hwi/it_los_hwi_005.c b/testsuits/sample/kernel/hwi/it_los_hwi_005.c index f99538f2..d75482ae 100644 --- a/testsuits/sample/kernel/hwi/it_los_hwi_005.c +++ b/testsuits/sample/kernel/hwi/it_los_hwi_005.c @@ -50,7 +50,7 @@ static UINT32 Testcase(VOID) HWI_MODE_T mode = 0; HWI_ARG_T arg = 0; - ret = LOS_HwiCreate(HWI_NUM_INT0, hwiPrio, mode, (HWI_PROC_FUNC)HwiF01, arg); + ret = LOS_HwiCreate(HWI_NUM_TEST2, hwiPrio, mode, (HWI_PROC_FUNC)HwiF01, arg); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); ret = LOS_HwiCreate(HWI_NUM_INT1, hwiPrio, mode, (HWI_PROC_FUNC)HwiF01, arg); @@ -67,16 +67,16 @@ static UINT32 Testcase(VOID) EXIT3: TestHwiDelete(HWI_NUM_TEST); TestHwiDelete(HWI_NUM_INT1); - TestHwiDelete(HWI_NUM_INT0); + TestHwiDelete(HWI_NUM_TEST2); return LOS_OK; EXIT2: TestHwiDelete(HWI_NUM_INT1); - TestHwiDelete(HWI_NUM_INT0); + TestHwiDelete(HWI_NUM_TEST2); return LOS_OK; EXIT1: - TestHwiDelete(HWI_NUM_INT0); + TestHwiDelete(HWI_NUM_TEST2); return LOS_OK; } diff --git a/testsuits/sample/kernel/hwi/it_los_hwi_032.c b/testsuits/sample/kernel/hwi/it_los_hwi_032.c index fbfc803e..6e193a34 100644 --- a/testsuits/sample/kernel/hwi/it_los_hwi_032.c +++ b/testsuits/sample/kernel/hwi/it_los_hwi_032.c @@ -46,6 +46,7 @@ static int g_uwIndex; #else #define TEST_MAX_NUMBER_HWI (OS_USER_HWI_MAX - HWI_NUM_INT0) #define TEST_HWI_COUNT (TEST_MAX_NUMBER_HWI - 2) +#define HWI_NUM_INT0 HWI_NUM_INT1 #endif static VOID HwiF01(VOID) diff --git a/testsuits/sample/kernel/hwi/it_los_hwi_033.c b/testsuits/sample/kernel/hwi/it_los_hwi_033.c index 5d833c1f..d820b212 100644 --- a/testsuits/sample/kernel/hwi/it_los_hwi_033.c +++ b/testsuits/sample/kernel/hwi/it_los_hwi_033.c @@ -42,7 +42,7 @@ static VOID HwiF01(VOID) return; } - +#define HWI_NUM_INT0 HWI_NUM_TEST1 static UINT32 Testcase(VOID) { UINT32 ret; @@ -54,14 +54,14 @@ static UINT32 Testcase(VOID) for (loop = 0; loop < HWI_LOOP_NUM; loop++) { for (index = 0; index < OS_HWI_MAX_USED_NUM; index++) { - /* if not Interrupt number HWI_NUM_INT0 + 3\4\32\35\36. */ + /* if not Interrupt number HWI_NUM_TEST1 + 3\4\32\35\36. */ if ((index != 3) && (index != 4) && (index != 32) && (index != 35) && (index != 36)) { - ret = LOS_HwiCreate(HWI_NUM_INT0 + index, hwiPrio, mode, (HWI_PROC_FUNC)HwiF01, arg); + ret = LOS_HwiCreate(HWI_NUM_TEST1 + index, hwiPrio, mode, (HWI_PROC_FUNC)HwiF01, arg); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); } for (index = OS_USER_HWI_MIN; index < OS_HWI_MAX_USED_NUM; index++) { - TestHwiDelete(HWI_NUM_INT0 + index); + TestHwiDelete(HWI_NUM_TEST1 + index); } } }