From b27264b9f32d6d6ef50ffdb96782fc7a09327e0f Mon Sep 17 00:00:00 2001 From: lnlan Date: Sat, 8 May 2021 10:09:39 +0800 Subject: [PATCH] add testsuites/kernel to build Change-Id: Ia14a3413b6c974771cef2e147083c7748abd1c59 --- Kconfig | 6 ++++++ kernel/common/los_config.c | 6 +++++- testsuites/Makefile | 1 - testsuites/kernel/include/osTest.h | 2 +- .../sample/kernel_base/core/task/smp/It_smp_los_task_002.c | 2 +- .../sample/kernel_base/core/task/smp/It_smp_los_task_003.c | 2 +- .../sample/kernel_base/core/task/smp/It_smp_los_task_026.c | 2 +- .../sample/kernel_base/ipc/event/full/It_los_event_039.c | 3 ++- testsuites/kernel/sample/kernel_base/ipc/sem/It_los_sem.c | 5 ----- testsuites/kernel/src/osTest.c | 4 ++-- 10 files changed, 19 insertions(+), 14 deletions(-) diff --git a/Kconfig b/Kconfig index fbf80924..88fc3389 100644 --- a/Kconfig +++ b/Kconfig @@ -322,6 +322,12 @@ menu "Security" source "../../kernel/liteos_a/security/Kconfig" endmenu +menu "Test" +config ENABLE_KERNEL_TEST + bool "Enable Kernel Test" + default n +endmenu + menu "Stack Smashing Protector (SSP) Compiler Feature" choice diff --git a/kernel/common/los_config.c b/kernel/common/los_config.c index d593007f..bca1ceb1 100644 --- a/kernel/common/los_config.c +++ b/kernel/common/los_config.c @@ -117,7 +117,6 @@ #include "los_hilog.h" #endif - STATIC SystemRebootFunc g_rebootHook = NULL; VOID OsSetRebootHook(SystemRebootFunc func) @@ -373,7 +372,12 @@ STATIC UINT32 OsSystemInitTaskCreate(VOID) TSK_INIT_PARAM_S sysTask; (VOID)memset_s(&sysTask, sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S)); +#ifndef LOSCFG_ENABLE_KERNEL_TEST sysTask.pfnTaskEntry = (TSK_ENTRY_FUNC)SystemInit; +#else + extern void TestSystemInit(void); + sysTask.pfnTaskEntry = (TSK_ENTRY_FUNC)TestSystemInit; +#endif sysTask.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE; sysTask.pcName = "SystemInit"; sysTask.usTaskPrio = LOSCFG_BASE_CORE_TSK_DEFAULT_PRIO; diff --git a/testsuites/Makefile b/testsuites/Makefile index 4b3d7ee8..a50c0552 100644 --- a/testsuites/Makefile +++ b/testsuites/Makefile @@ -92,7 +92,6 @@ $(LITEOS_TEST_LIBC): $(KERNEL) $(KERNEL): $(LITEOS_TEST_AUTOCONFIG_H) $(HIDE)$(MAKE) -C ../ lib || exit 1 - #echo "LITEOS_CFLAGS : $(LITEOS_CFLAGS)" ##### make test menuconfig ##### export CONFIG_=LOSCFG_ diff --git a/testsuites/kernel/include/osTest.h b/testsuites/kernel/include/osTest.h index bdb549a5..7ad31b69 100644 --- a/testsuites/kernel/include/osTest.h +++ b/testsuites/kernel/include/osTest.h @@ -94,7 +94,7 @@ extern "C" { testTask.pcName = task_name; \ testTask.usTaskPrio = prio; \ testTask.uwResved = LOS_TASK_STATUS_DETACHED; \ - } while (0) + } while (0); #if (LOSCFG_KERNEL_SMP == YES) #define TEST_TASK_PARAM_INIT_AFFI(testTask, task_name, entry, prio, affi) \ diff --git a/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_002.c b/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_002.c index cb28d377..ad1ee4a4 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_002.c +++ b/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_002.c @@ -40,7 +40,7 @@ extern "C" { static void TaskF01(void) { while (1) { - Wfi(); + WFI; }; } diff --git a/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_003.c b/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_003.c index f845f457..cdf68a71 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_003.c +++ b/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_003.c @@ -40,7 +40,7 @@ extern "C" { static void TaskF01(void) { while (1) { - Wfi(); + WFI; }; } diff --git a/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_026.c b/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_026.c index 6f2f81cc..d0ba60e3 100644 --- a/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_026.c +++ b/testsuites/kernel/sample/kernel_base/core/task/smp/It_smp_los_task_026.c @@ -42,7 +42,7 @@ static void TaskF01(void) { LOS_AtomicInc(&g_testCount); while (1) { - Wfi(); + WFI; } } diff --git a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_039.c b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_039.c index 886dd7ed..4afc4dcf 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_039.c +++ b/testsuites/kernel/sample/kernel_base/ipc/event/full/It_los_event_039.c @@ -43,7 +43,7 @@ static VOID TaskF01(VOID) g_testCount++; - ret = LOS_EventRead(&g_event, 0x11, LOS_WAITMODE_AND, 2); // 2, The timeout period for reading events. + ret = LOS_EventRead(&g_event, 0x11, LOS_WAITMODE_AND, 200); // 200, The timeout period for reading events. ICUNIT_GOTO_EQUAL(ret, 0, ret, EXIT); ICUNIT_GOTO_EQUAL(g_event.uwEventID, 0, g_event.uwEventID, EXIT); @@ -98,6 +98,7 @@ static UINT32 Testcase(VOID) LOS_TaskUnlock(); + LOS_TaskDelay(1); ICUNIT_GOTO_EQUAL(g_testCount, 2, g_testCount, EXIT); // 2, Here, assert that g_testCount is equal to 2. EXIT: diff --git a/testsuites/kernel/sample/kernel_base/ipc/sem/It_los_sem.c b/testsuites/kernel/sample/kernel_base/ipc/sem/It_los_sem.c index 3e8b583f..4a07e548 100644 --- a/testsuites/kernel/sample/kernel_base/ipc/sem/It_los_sem.c +++ b/testsuites/kernel/sample/kernel_base/ipc/sem/It_los_sem.c @@ -98,11 +98,6 @@ VOID ItSuiteLosSem(void) ItLosSem017(); ItLosSem019(); ItLosSem020(); -#if (LOSCFG_KERNEL_SMP != YES) - ItLosSem018(); - ItLosSem021(); - ItLosSem025(); -#endif ItLosSem022(); ItLosSem023(); ItLosSem026(); diff --git a/testsuites/kernel/src/osTest.c b/testsuites/kernel/src/osTest.c index 12d730d4..a9762cec 100644 --- a/testsuites/kernel/src/osTest.c +++ b/testsuites/kernel/src/osTest.c @@ -294,7 +294,7 @@ VOID TestBusyTaskDelay(UINT32 tick) if (runtime <= TestTickCountByCurrCpuid()) { break; } - Wfi(); + WFI; } } @@ -307,7 +307,7 @@ VOID TestAssertBusyTaskDelay(UINT32 timeout, UINT32 flag) if ((runtime <= TestTickCountGet()) || (g_testCount == flag)) { break; } - Wfi(); + WFI; } } -- GitLab