yystopf
/
openharmony_kernel_liteos_m
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!312 fix:修复测试用例导致系统异常及中断用例失败问题 

Merge pull request !312 from zhushengle/test
This commit is contained in:
openharmony_ci 2021-09-17 00:58:44 +00:00 committed by Gitee
parent 4700ba6973 9ca65adf32
commit f1ac6bf160
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
testsuits/include/osTest.h
View File

@ -199,7 +199,6 @@ extern EVENT_CB_S g_exampleEvent;
#define TASK_PRIO_TEST 25 #define TASK_PRIO_TEST 25
#define TASK_PRIO_TEST_NORMAL 20 #define TASK_PRIO_TEST_NORMAL 20
#define TASK_STACK_SIZE_TEST 0x400
#define TASK_LOOP_NUM 0x100000 #define TASK_LOOP_NUM 0x100000
#define QUEUE_LOOP_NUM 100 #define QUEUE_LOOP_NUM 100
#define HWI_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_TASK_RUNTIME 0x100000
#define TEST_SWTMR_RUNTIME 0x1000000 #define TEST_SWTMR_RUNTIME 0x1000000
#define TEST_HWI_RUNTIME 0x100000 #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_LOW osPriorityBelowNormal // tskIDLE_PRIORITY + 10
#define TEST_TASK_PRIORITY_NORMAL osPriorityNormal // tskIDLE_PRIORITY + 11 #define TEST_TASK_PRIORITY_NORMAL osPriorityNormal // tskIDLE_PRIORITY + 11
#define TEST_TASK_PRIORITY_HIGH osPriorityAboveNormal // tskIDLE_PRIORITY + 12 #define TEST_TASK_PRIORITY_HIGH osPriorityAboveNormal // tskIDLE_PRIORITY + 12
@ -226,6 +224,8 @@ extern EVENT_CB_S g_exampleEvent;
#else #else
#define OS_TSK_TEST_STACK_SIZE 0x1000 #define OS_TSK_TEST_STACK_SIZE 0x1000
#endif #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 TASK_CMSIS_STACK_SIZE_TEST 0x600
#define OS_EVENT_TIMEOUT_MAX_VAL 0xFFFFFFFF #define OS_EVENT_TIMEOUT_MAX_VAL 0xFFFFFFFF

8
testsuits/sample/kernel/hwi/it_los_hwi_005.c
View File

@ -50,7 +50,7 @@ static UINT32 Testcase(VOID)
HWI_MODE_T mode = 0; HWI_MODE_T mode = 0;
HWI_ARG_T arg = 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); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
ret = LOS_HwiCreate(HWI_NUM_INT1, hwiPrio, mode, (HWI_PROC_FUNC)HwiF01, arg); ret = LOS_HwiCreate(HWI_NUM_INT1, hwiPrio, mode, (HWI_PROC_FUNC)HwiF01, arg);
@ -67,16 +67,16 @@ static UINT32 Testcase(VOID)
EXIT3: EXIT3:
TestHwiDelete(HWI_NUM_TEST); TestHwiDelete(HWI_NUM_TEST);
TestHwiDelete(HWI_NUM_INT1); TestHwiDelete(HWI_NUM_INT1);
TestHwiDelete(HWI_NUM_INT0); TestHwiDelete(HWI_NUM_TEST2);
return LOS_OK; return LOS_OK;
EXIT2: EXIT2:
TestHwiDelete(HWI_NUM_INT1); TestHwiDelete(HWI_NUM_INT1);
TestHwiDelete(HWI_NUM_INT0); TestHwiDelete(HWI_NUM_TEST2);
return LOS_OK; return LOS_OK;
EXIT1: EXIT1:
TestHwiDelete(HWI_NUM_INT0); TestHwiDelete(HWI_NUM_TEST2);
return LOS_OK; return LOS_OK;
} }

1
testsuits/sample/kernel/hwi/it_los_hwi_032.c
View File

@ -46,6 +46,7 @@ static int g_uwIndex;
#else #else
#define TEST_MAX_NUMBER_HWI (OS_USER_HWI_MAX - HWI_NUM_INT0) #define TEST_MAX_NUMBER_HWI (OS_USER_HWI_MAX - HWI_NUM_INT0)
#define TEST_HWI_COUNT (TEST_MAX_NUMBER_HWI - 2) #define TEST_HWI_COUNT (TEST_MAX_NUMBER_HWI - 2)
#define HWI_NUM_INT0 HWI_NUM_INT1
#endif #endif
static VOID HwiF01(VOID) static VOID HwiF01(VOID)

8
testsuits/sample/kernel/hwi/it_los_hwi_033.c
View File

@ -42,7 +42,7 @@ static VOID HwiF01(VOID)
return; return;
} }
#define HWI_NUM_INT0 HWI_NUM_TEST1
static UINT32 Testcase(VOID) static UINT32 Testcase(VOID)
{ {
UINT32 ret; UINT32 ret;
@ -54,14 +54,14 @@ static UINT32 Testcase(VOID)
for (loop = 0; loop < HWI_LOOP_NUM; loop++) { for (loop = 0; loop < HWI_LOOP_NUM; loop++) {
for (index = 0; index < OS_HWI_MAX_USED_NUM; index++) { 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)) { 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); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
} }
for (index = OS_USER_HWI_MIN; index < OS_HWI_MAX_USED_NUM; index++) { for (index = OS_USER_HWI_MIN; index < OS_HWI_MAX_USED_NUM; index++) {
TestHwiDelete(HWI_NUM_INT0 + index); TestHwiDelete(HWI_NUM_TEST1 + index);
} }
} }
} }