From 3ad5942301a1094a2c6b6ffee280cf09cfdb2a88 Mon Sep 17 00:00:00 2001 From: zhushengle Date: Wed, 28 Jul 2021 20:22:58 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=94=AF=E6=8C=81smoke=20=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 默认只运行smoke测试用例，如需要运行全量测试用例， 请在target_config.h中添加配置项: LOS_KERNEL_TEST_FULL 或在config.json中配置enable_ohos_kernel_liteos_m_test_full Close #I424RX Signed-off-by: zhushengle Change-Id: I1f72a7666bf30631090e3e00faf6c432105dec17 --- testsuits/BUILD.gn | 81 ++--- testsuits/include/osTest.h | 4 +- testsuits/sample/kernel/event/BUILD.gn | 101 +++---- testsuits/sample/kernel/event/It_los_event.c | 44 ++- testsuits/sample/kernel/hwi/BUILD.gn | 87 +++--- testsuits/sample/kernel/mem/BUILD.gn | 83 +++-- testsuits/sample/kernel/mem/it_los_mem.c | 4 +- testsuits/sample/kernel/mux/BUILD.gn | 81 +++-- testsuits/sample/kernel/mux/It_los_mux.c | 39 ++- testsuits/sample/kernel/queue/BUILD.gn | 286 +++++++++--------- testsuits/sample/kernel/queue/It_los_queue.c | 26 +- testsuits/sample/kernel/sem/BUILD.gn | 103 ++++--- testsuits/sample/kernel/sem/It_los_sem.c | 27 +- testsuits/sample/kernel/sem/It_los_sem_011.c | 6 - testsuits/sample/kernel/swtmr/BUILD.gn | 239 ++++++++------- testsuits/sample/kernel/swtmr/It_los_swtmr.c | 56 ++-- .../sample/kernel/swtmr/It_los_swtmr_002.c | 10 +- .../sample/kernel/swtmr/It_los_swtmr_013.c | 9 +- .../sample/kernel/swtmr/It_los_swtmr_016.c | 7 +- .../sample/kernel/swtmr/It_los_swtmr_021.c | 9 +- .../kernel/swtmr/It_los_swtmr_Align_003.c | 2 +- testsuits/sample/kernel/task/BUILD.gn | 245 ++++++++------- testsuits/sample/kernel/task/It_los_task.c | 63 ++-- testsuits/unittest/posix/BUILD.gn | 20 +- 24 files changed, 803 insertions(+), 829 deletions(-) diff --git a/testsuits/BUILD.gn b/testsuits/BUILD.gn index 212bc2ca..8445a2bd 100644 --- a/testsuits/BUILD.gn +++ b/testsuits/BUILD.gn @@ -1,36 +1,45 @@ -# Copyright (c) Huawei Technologies Co., Ltd. 2020. All rights reserved. -import("//build/lite/config/component/lite_component.gni") - -config("include") { - include_dirs = [ - "include", - "//kernel/liteos_m/kernel/include", - "//kernel/liteos_m/kernel/arch/include", - "//kernel/liteos_m/components/cpup", - ] -} - -static_library("test_init") { - - sources = [ - "src/osTest.c", - "src/iCunit.c", - ] - - configs += [ ":include" ] -} - -lite_component("test") { - features = [ - ":test_init", - "sample/kernel/event:test_event", - "sample/kernel/hwi:test_hwi", - "sample/kernel/mem:test_mem", - "sample/kernel/mux:test_mux", - "sample/kernel/queue:test_queue", - "sample/kernel/sem:test_sem", - "sample/kernel/swtmr:test_swtmr", - "sample/kernel/task:test_task", - #"sample/kernel/tickless:test_tickless", - ] -} +# Copyright (c) Huawei Technologies Co., Ltd. 2020. All rights reserved. +import("//build/lite/config/component/lite_component.gni") + +declare_args() { + enable_ohos_kernel_liteos_m_test_full = false +} + +config("include") { + defines = [] + include_dirs = [ + "include", + "//kernel/liteos_m/kernel/include", + "//kernel/liteos_m/kernel/arch/include", + "//kernel/liteos_m/components/cpup", + ] + + if (enable_ohos_kernel_liteos_m_test_full == true) { + defines += [ "LOS_KERNEL_TEST_FULL=1" ] + } +} + +static_library("test_init") { + sources = [ + "src/iCunit.c", + "src/osTest.c", + ] + + configs += [ ":include" ] +} + +lite_component("test") { + features = [ + ":test_init", + "sample/kernel/event:test_event", + "sample/kernel/hwi:test_hwi", + "sample/kernel/mem:test_mem", + "sample/kernel/mux:test_mux", + "sample/kernel/queue:test_queue", + "sample/kernel/sem:test_sem", + "sample/kernel/swtmr:test_swtmr", + "sample/kernel/task:test_task", + + #"sample/kernel/tickless:test_tickless", + ] +} diff --git a/testsuits/include/osTest.h b/testsuits/include/osTest.h index 809ab425..4d69ccb3 100644 --- a/testsuits/include/osTest.h +++ b/testsuits/include/osTest.h @@ -68,8 +68,8 @@ extern "C" { #define LITEOS_BASE_TEST 1 -#ifndef LOS_KERNEL_TEST_NOT_SMOKE -#define LOS_KERNEL_TEST_NOT_SMOKE 1 +#ifndef LOS_KERNEL_TEST_FULL +#define LOS_KERNEL_TEST_FULL 0 #endif #define LOS_KERNEL_CORE_TASK_TEST 1 #define LOS_KERNEL_IPC_MUX_TEST 1 diff --git a/testsuits/sample/kernel/event/BUILD.gn b/testsuits/sample/kernel/event/BUILD.gn index 696f8242..581b3629 100644 --- a/testsuits/sample/kernel/event/BUILD.gn +++ b/testsuits/sample/kernel/event/BUILD.gn @@ -1,52 +1,51 @@ # Copyright (c) Huawei Technologies Co., Ltd. 2020. All rights reserved. - -static_library("test_event") { - - sources = [ - "It_los_event_001.c", - "It_los_event_002.c", - "It_los_event_003.c", - "It_los_event_004.c", - "It_los_event_005.c", - "It_los_event_006.c", - "It_los_event_007.c", - "It_los_event_008.c", - "It_los_event_009.c", - "It_los_event_010.c", - "It_los_event_011.c", - "It_los_event_012.c", - "It_los_event_013.c", - "It_los_event_014.c", - "It_los_event_015.c", - "It_los_event_016.c", - "It_los_event_017.c", - "It_los_event_018.c", - "It_los_event_019.c", - "It_los_event_020.c", - "It_los_event_021.c", - "It_los_event_022.c", - "It_los_event_023.c", - "It_los_event_024.c", - "It_los_event_026.c", - "It_los_event_027.c", - "It_los_event_028.c", - "It_los_event_029.c", - "It_los_event_030.c", - "It_los_event_031.c", - "It_los_event_032.c", - "It_los_event_033.c", - "It_los_event_034.c", - "It_los_event_035.c", - "It_los_event_036.c", - "It_los_event_037.c", - "It_los_event_038.c", - "It_los_event_039.c", - "It_los_event_040.c", - "It_los_event_041.c", - "It_los_event_042.c", - "It_los_event_043.c", - "It_los_event.c", - ] - - configs += [ "//kernel/liteos_m/testsuits:include" ] -} + +static_library("test_event") { + sources = [ + "It_los_event.c", + "It_los_event_001.c", + "It_los_event_002.c", + "It_los_event_003.c", + "It_los_event_004.c", + "It_los_event_005.c", + "It_los_event_006.c", + "It_los_event_007.c", + "It_los_event_008.c", + "It_los_event_009.c", + "It_los_event_010.c", + "It_los_event_011.c", + "It_los_event_012.c", + "It_los_event_013.c", + "It_los_event_014.c", + "It_los_event_015.c", + "It_los_event_016.c", + "It_los_event_017.c", + "It_los_event_018.c", + "It_los_event_019.c", + "It_los_event_020.c", + "It_los_event_021.c", + "It_los_event_022.c", + "It_los_event_023.c", + "It_los_event_024.c", + "It_los_event_026.c", + "It_los_event_027.c", + "It_los_event_028.c", + "It_los_event_029.c", + "It_los_event_030.c", + "It_los_event_031.c", + "It_los_event_032.c", + "It_los_event_033.c", + "It_los_event_034.c", + "It_los_event_035.c", + "It_los_event_036.c", + "It_los_event_037.c", + "It_los_event_038.c", + "It_los_event_039.c", + "It_los_event_040.c", + "It_los_event_041.c", + "It_los_event_042.c", + "It_los_event_043.c", + ] + + configs += [ "//kernel/liteos_m/testsuits:include" ] +} diff --git a/testsuits/sample/kernel/event/It_los_event.c b/testsuits/sample/kernel/event/It_los_event.c index 39467dc7..a2e25e09 100644 --- a/testsuits/sample/kernel/event/It_los_event.c +++ b/testsuits/sample/kernel/event/It_los_event.c @@ -38,8 +38,6 @@ EVENT_CB_S g_pevent; VOID ItSuiteLosEvent() { ItLosEvent001(); - ItLosEvent002(); - ItLosEvent003(); ItLosEvent004(); ItLosEvent005(); ItLosEvent006(); @@ -47,42 +45,42 @@ VOID ItSuiteLosEvent() ItLosEvent008(); ItLosEvent009(); ItLosEvent010(); - ItLosEvent011(); - ItLosEvent012(); ItLosEvent013(); ItLosEvent014(); - ItLosEvent015(); ItLosEvent016(); ItLosEvent017(); ItLosEvent018(); - ItLosEvent019(); - ItLosEvent020(); ItLosEvent021(); ItLosEvent022(); -#if (LOS_KERNEL_HWI_TEST == 1) - ItLosEvent023(); - ItLosEvent024(); -#endif ItLosEvent026(); - ItLosEvent027(); - ItLosEvent028(); ItLosEvent029(); - ItLosEvent030(); ItLosEvent031(); - ItLosEvent032(); - ItLosEvent033(); -#if (LOS_KERNEL_TEST_NOT_SMOKE == 1) - ItLosEvent034(); -#endif ItLosEvent035(); ItLosEvent036(); ItLosEvent037(); -#if (LOS_KERNEL_HWI_TEST == 1) - ItLosEvent038(); -#endif - ItLosEvent039(); ItLosEvent040(); ItLosEvent041(); ItLosEvent042(); ItLosEvent043(); +#if (LOS_KERNEL_TEST_FULL == 1) + ItLosEvent002(); + ItLosEvent003(); + ItLosEvent011(); + ItLosEvent012(); + ItLosEvent015(); + ItLosEvent019(); + ItLosEvent020(); + ItLosEvent027(); + ItLosEvent028(); + ItLosEvent030(); + ItLosEvent032(); + ItLosEvent033(); + ItLosEvent034(); + ItLosEvent039(); +#if (LOS_KERNEL_HWI_TEST == 1) + ItLosEvent023(); + ItLosEvent024(); + ItLosEvent038(); +#endif +#endif } diff --git a/testsuits/sample/kernel/hwi/BUILD.gn b/testsuits/sample/kernel/hwi/BUILD.gn index 769a000a..6529f344 100644 --- a/testsuits/sample/kernel/hwi/BUILD.gn +++ b/testsuits/sample/kernel/hwi/BUILD.gn @@ -1,45 +1,44 @@ # Copyright (c) Huawei Technologies Co., Ltd. 2020. All rights reserved. - -static_library("test_hwi") { - - sources = [ - "it_los_hwi_001.c", - "it_los_hwi_002.c", - "it_los_hwi_003.c", - "it_los_hwi_004.c", - "it_los_hwi_005.c", - "it_los_hwi_006.c", - "it_los_hwi_007.c", - "it_los_hwi_008.c", - "it_los_hwi_009.c", - "it_los_hwi_010.c", - "it_los_hwi_011.c", - "it_los_hwi_012.c", - "it_los_hwi_013.c", - "it_los_hwi_014.c", - "it_los_hwi_015.c", - "it_los_hwi_016.c", - "it_los_hwi_017.c", - "it_los_hwi_018.c", - "it_los_hwi_019.c", - "it_los_hwi_020.c", - "it_los_hwi_021.c", - "it_los_hwi_022.c", - "it_los_hwi_023.c", - "it_los_hwi_024.c", - "it_los_hwi_025.c", - "it_los_hwi_026.c", - "it_los_hwi_027.c", - "it_los_hwi_028.c", - "it_los_hwi_029.c", - "it_los_hwi_030.c", - "it_los_hwi_031.c", - "it_los_hwi_032.c", - "it_los_hwi_033.c", - "it_los_hwi_034.c", - "It_los_hwi.c", - "llt_los_hwi_035.c", - ] - - configs += [ "//kernel/liteos_m/testsuits:include" ] -} + +static_library("test_hwi") { + sources = [ + "It_los_hwi.c", + "it_los_hwi_001.c", + "it_los_hwi_002.c", + "it_los_hwi_003.c", + "it_los_hwi_004.c", + "it_los_hwi_005.c", + "it_los_hwi_006.c", + "it_los_hwi_007.c", + "it_los_hwi_008.c", + "it_los_hwi_009.c", + "it_los_hwi_010.c", + "it_los_hwi_011.c", + "it_los_hwi_012.c", + "it_los_hwi_013.c", + "it_los_hwi_014.c", + "it_los_hwi_015.c", + "it_los_hwi_016.c", + "it_los_hwi_017.c", + "it_los_hwi_018.c", + "it_los_hwi_019.c", + "it_los_hwi_020.c", + "it_los_hwi_021.c", + "it_los_hwi_022.c", + "it_los_hwi_023.c", + "it_los_hwi_024.c", + "it_los_hwi_025.c", + "it_los_hwi_026.c", + "it_los_hwi_027.c", + "it_los_hwi_028.c", + "it_los_hwi_029.c", + "it_los_hwi_030.c", + "it_los_hwi_031.c", + "it_los_hwi_032.c", + "it_los_hwi_033.c", + "it_los_hwi_034.c", + "llt_los_hwi_035.c", + ] + + configs += [ "//kernel/liteos_m/testsuits:include" ] +} diff --git a/testsuits/sample/kernel/mem/BUILD.gn b/testsuits/sample/kernel/mem/BUILD.gn index c6091b6b..00a762a9 100644 --- a/testsuits/sample/kernel/mem/BUILD.gn +++ b/testsuits/sample/kernel/mem/BUILD.gn @@ -1,43 +1,42 @@ # Copyright (c) Huawei Technologies Co., Ltd. 2020. All rights reserved. - -static_library("test_mem") { - - sources = [ - "It_los_mem_001.c", - "It_los_mem_002.c", - "It_los_mem_003.c", - "It_los_mem_004.c", - "It_los_mem_005.c", - "It_los_mem_006.c", - "It_los_mem_007.c", - "It_los_mem_008.c", - "It_los_mem_009.c", - "It_los_mem_010.c", - "It_los_mem_011.c", - "It_los_mem_012.c", - "It_los_mem_013.c", - "It_los_mem_014.c", - "It_los_mem_015.c", - "It_los_mem_016.c", - "It_los_mem_017.c", - "It_los_mem_018.c", - "It_los_mem_019.c", - "It_los_mem_020.c", - "It_los_mem_035.c", - "It_los_mem_036.c", - "It_los_mem_037.c", - "It_los_mem_038.c", - "It_los_mem_040.c", - "It_los_mem_045.c", - "it_los_mem.c", - "It_los_tick_001.c", - ] - - configs += [ "//kernel/liteos_m/testsuits:include" ] - - defines = [ - "LOS_RECORD_LR_CNT=3", - "LOS_DLNK_NODE_HEAD_SIZE=0", - "MIN_DLNK_POOL_SIZE=0" - ] -} + +static_library("test_mem") { + sources = [ + "It_los_mem_001.c", + "It_los_mem_002.c", + "It_los_mem_003.c", + "It_los_mem_004.c", + "It_los_mem_005.c", + "It_los_mem_006.c", + "It_los_mem_007.c", + "It_los_mem_008.c", + "It_los_mem_009.c", + "It_los_mem_010.c", + "It_los_mem_011.c", + "It_los_mem_012.c", + "It_los_mem_013.c", + "It_los_mem_014.c", + "It_los_mem_015.c", + "It_los_mem_016.c", + "It_los_mem_017.c", + "It_los_mem_018.c", + "It_los_mem_019.c", + "It_los_mem_020.c", + "It_los_mem_035.c", + "It_los_mem_036.c", + "It_los_mem_037.c", + "It_los_mem_038.c", + "It_los_mem_040.c", + "It_los_mem_045.c", + "It_los_tick_001.c", + "it_los_mem.c", + ] + + configs += [ "//kernel/liteos_m/testsuits:include" ] + + defines = [ + "LOS_RECORD_LR_CNT=3", + "LOS_DLNK_NODE_HEAD_SIZE=0", + "MIN_DLNK_POOL_SIZE=0", + ] +} diff --git a/testsuits/sample/kernel/mem/it_los_mem.c b/testsuits/sample/kernel/mem/it_los_mem.c index 8207c5f8..0c823c62 100644 --- a/testsuits/sample/kernel/mem/it_los_mem.c +++ b/testsuits/sample/kernel/mem/it_los_mem.c @@ -104,7 +104,9 @@ VOID ItSuiteLosMem(void) #endif ItLosMem040(); ItLosMem045(); - ItLosTick001(); +#if (LOS_KERNEL_TEST_FULL == 1) + ItLosTick001(); +#endif MemEnd(); } diff --git a/testsuits/sample/kernel/mux/BUILD.gn b/testsuits/sample/kernel/mux/BUILD.gn index 9b82d480..ad8d19ea 100644 --- a/testsuits/sample/kernel/mux/BUILD.gn +++ b/testsuits/sample/kernel/mux/BUILD.gn @@ -1,42 +1,41 @@ # Copyright (c) Huawei Technologies Co., Ltd. 2020. All rights reserved. - -static_library("test_mux") { - - sources = [ - "It_los_mutex_001.c", - "It_los_mutex_002.c", - "It_los_mutex_003.c", - "It_los_mutex_004.c", - "It_los_mutex_005.c", - "It_los_mutex_006.c", - "It_los_mutex_007.c", - "It_los_mutex_008.c", - "It_los_mutex_009.c", - "It_los_mutex_010.c", - "It_los_mutex_011.c", - "It_los_mutex_012.c", - "It_los_mutex_013.c", - "It_los_mutex_014.c", - "It_los_mutex_015.c", - "It_los_mutex_016.c", - "It_los_mutex_017.c", - "It_los_mutex_018.c", - "It_los_mutex_019.c", - "It_los_mutex_020.c", - "It_los_mutex_021.c", - "It_los_mutex_022.c", - "It_los_mutex_023.c", - "It_los_mutex_024.c", - "It_los_mutex_025.c", - "It_los_mutex_026.c", - "It_los_mutex_027.c", - "It_los_mutex_029.c", - "It_los_mutex_030.c", - "It_los_mutex_031.c", - "It_los_mutex_033.c", - "It_los_mutex_034.c", - "It_los_mux.c", - ] - - configs += [ "//kernel/liteos_m/testsuits:include" ] -} + +static_library("test_mux") { + sources = [ + "It_los_mutex_001.c", + "It_los_mutex_002.c", + "It_los_mutex_003.c", + "It_los_mutex_004.c", + "It_los_mutex_005.c", + "It_los_mutex_006.c", + "It_los_mutex_007.c", + "It_los_mutex_008.c", + "It_los_mutex_009.c", + "It_los_mutex_010.c", + "It_los_mutex_011.c", + "It_los_mutex_012.c", + "It_los_mutex_013.c", + "It_los_mutex_014.c", + "It_los_mutex_015.c", + "It_los_mutex_016.c", + "It_los_mutex_017.c", + "It_los_mutex_018.c", + "It_los_mutex_019.c", + "It_los_mutex_020.c", + "It_los_mutex_021.c", + "It_los_mutex_022.c", + "It_los_mutex_023.c", + "It_los_mutex_024.c", + "It_los_mutex_025.c", + "It_los_mutex_026.c", + "It_los_mutex_027.c", + "It_los_mutex_029.c", + "It_los_mutex_030.c", + "It_los_mutex_031.c", + "It_los_mutex_033.c", + "It_los_mutex_034.c", + "It_los_mux.c", + ] + + configs += [ "//kernel/liteos_m/testsuits:include" ] +} diff --git a/testsuits/sample/kernel/mux/It_los_mux.c b/testsuits/sample/kernel/mux/It_los_mux.c index bf420c26..4957386c 100644 --- a/testsuits/sample/kernel/mux/It_los_mux.c +++ b/testsuits/sample/kernel/mux/It_los_mux.c @@ -43,39 +43,38 @@ VOID ItSuiteLosMux(void) ItLosMux004(); ItLosMux005(); ItLosMux006(); - ItLosMux007(); ItLosMux008(); ItLosMux009(); + ItLosMux018(); + ItLosMux023(); + ItLosMux026(); + ItLosMux027(); + ItLosMux029(); + ItLosMux031(); + +#if (LOS_KERNEL_TEST_FULL == 1) + ItLosMux007(); ItLosMux010(); ItLosMux011(); ItLosMux012(); -#if (LOS_KERNEL_HWI_TEST == 1) - ItLosMux013(); -#endif ItLosMux014(); ItLosMux015(); -#if (LOS_KERNEL_HWI_TEST == 1) - ItLosMux016(); - ItLosMux017(); -#endif - ItLosMux018(); -#if (LOS_KERNEL_HWI_TEST == 1) - ItLosMux019(); -#endif -#ifndef __RISC_V__ - ItLosMux020(); -#endif ItLosMux021(); ItLosMux022(); - ItLosMux023(); ItLosMux024(); ItLosMux025(); - ItLosMux026(); - ItLosMux027(); - ItLosMux029(); ItLosMux030(); - ItLosMux031(); ItLosMux033(); ItLosMux034(); +#if (LOS_KERNEL_HWI_TEST == 1) + ItLosMux013(); + ItLosMux016(); + ItLosMux017(); + ItLosMux019(); +#ifndef __RISC_V__ + ItLosMux020(); +#endif +#endif +#endif } diff --git a/testsuits/sample/kernel/queue/BUILD.gn b/testsuits/sample/kernel/queue/BUILD.gn index 4721664b..0d78b3bc 100644 --- a/testsuits/sample/kernel/queue/BUILD.gn +++ b/testsuits/sample/kernel/queue/BUILD.gn @@ -1,145 +1,143 @@ # Copyright (c) Huawei Technologies Co., Ltd. 2020. All rights reserved. - -static_library("test_queue") { - - sources = [ - "It_los_queue_001.c", - "It_los_queue_002.c", - "It_los_queue_003.c", - "It_los_queue_004.c", - "It_los_queue_005.c", - "It_los_queue_006.c", - "It_los_queue_007.c", - "It_los_queue_008.c", - "It_los_queue_009.c", - "It_los_queue_010.c", - "It_los_queue_011.c", - "It_los_queue_012.c", - "It_los_queue_013.c", - "It_los_queue_014.c", - "It_los_queue_015.c", - "It_los_queue_016.c", - "It_los_queue_017.c", - "It_los_queue_018.c", - "It_los_queue_019.c", - "It_los_queue_020.c", - "It_los_queue_021.c", - "It_los_queue_022.c", - "It_los_queue_025.c", - "It_los_queue_026.c", - "It_los_queue_027.c", - "It_los_queue_028.c", - "It_los_queue_029.c", - "It_los_queue_030.c", - "It_los_queue_031.c", - "It_los_queue_032.c", - "It_los_queue_033.c", - "It_los_queue_034.c", - "It_los_queue_035.c", - "It_los_queue_036.c", - "It_los_queue_037.c", - "It_los_queue_038.c", - "It_los_queue_039.c", - "It_los_queue_040.c", - "It_los_queue_041.c", - "It_los_queue_042.c", - "It_los_queue_043.c", - "It_los_queue_044.c", - "It_los_queue_045.c", - "It_los_queue_046.c", - "It_los_queue_047.c", - "It_los_queue_048.c", - "It_los_queue_050.c", - "It_los_queue_051.c", - "It_los_queue_052.c", - "It_los_queue_053.c", - "It_los_queue_054.c", - "It_los_queue_055.c", - "It_los_queue_056.c", - "It_los_queue_057.c", - "It_los_queue_058.c", - "It_los_queue_059.c", - "It_los_queue_060.c", - "It_los_queue_061.c", - "It_los_queue_062.c", - "It_los_queue_063.c", - "It_los_queue_064.c", - "It_los_queue_065.c", - "It_los_queue_066.c", - "It_los_queue_067.c", - "It_los_queue_068.c", - "It_los_queue_069.c", - "It_los_queue_070.c", - "It_los_queue_071.c", - "It_los_queue_072.c", - "It_los_queue_073.c", - "It_los_queue_074.c", - "It_los_queue_078.c", - "It_los_queue_079.c", - "It_los_queue_080.c", - "It_los_queue_081.c", - "It_los_queue_082.c", - "It_los_queue_083.c", - "It_los_queue_084.c", - "It_los_queue_085.c", - "It_los_queue_086.c", - "It_los_queue_087.c", - "It_los_queue_088.c", - "It_los_queue_090.c", - "It_los_queue_091.c", - "It_los_queue_092.c", - "It_los_queue_093.c", - "It_los_queue_094.c", - "It_los_queue_095.c", - "It_los_queue_096.c", - "It_los_queue_097.c", - "It_los_queue_104.c", - "It_los_queue_106.c", - "It_los_queue_107.c", - "It_los_queue_108.c", - "It_los_queue_109.c", - "It_los_queue_110.c", - "It_los_queue_114.c", - "It_los_queue.c", - "It_los_queue_head_001.c", - "It_los_queue_head_002.c", - "It_los_queue_head_003.c", - "It_los_queue_head_004.c", - "It_los_queue_head_005.c", - "It_los_queue_head_006.c", - "It_los_queue_head_007.c", - "It_los_queue_head_008.c", - "It_los_queue_head_009.c", - "It_los_queue_head_010.c", - "It_los_queue_head_011.c", - "It_los_queue_head_012.c", - "It_los_queue_head_013.c", - "It_los_queue_head_014.c", - "It_los_queue_head_015.c", - "It_los_queue_head_016.c", - "It_los_queue_head_019.c", - "It_los_queue_head_020.c", - "It_los_queue_head_021.c", - "It_los_queue_head_022.c", - "It_los_queue_head_023.c", - "It_los_queue_head_024.c", - "It_los_queue_head_025.c", - "It_los_queue_head_026.c", - "It_los_queue_head_027.c", - "It_los_queue_head_028.c", - "It_los_queue_head_029.c", - "It_los_queue_head_030.c", - "It_los_queue_head_031.c", - "It_los_queue_head_032.c", - "It_los_queue_head_038.c", - "It_los_queue_head_039.c", - "It_los_queue_head_040.c", - "It_los_queue_head_041.c", - "It_los_queue_head_042.c", - "Llt_los_queue_001.c", - "LLt_los_queue_003.c", - - ] - - configs += [ "//kernel/liteos_m/testsuits:include" ] -} + +static_library("test_queue") { + sources = [ + "It_los_queue.c", + "It_los_queue_001.c", + "It_los_queue_002.c", + "It_los_queue_003.c", + "It_los_queue_004.c", + "It_los_queue_005.c", + "It_los_queue_006.c", + "It_los_queue_007.c", + "It_los_queue_008.c", + "It_los_queue_009.c", + "It_los_queue_010.c", + "It_los_queue_011.c", + "It_los_queue_012.c", + "It_los_queue_013.c", + "It_los_queue_014.c", + "It_los_queue_015.c", + "It_los_queue_016.c", + "It_los_queue_017.c", + "It_los_queue_018.c", + "It_los_queue_019.c", + "It_los_queue_020.c", + "It_los_queue_021.c", + "It_los_queue_022.c", + "It_los_queue_025.c", + "It_los_queue_026.c", + "It_los_queue_027.c", + "It_los_queue_028.c", + "It_los_queue_029.c", + "It_los_queue_030.c", + "It_los_queue_031.c", + "It_los_queue_032.c", + "It_los_queue_033.c", + "It_los_queue_034.c", + "It_los_queue_035.c", + "It_los_queue_036.c", + "It_los_queue_037.c", + "It_los_queue_038.c", + "It_los_queue_039.c", + "It_los_queue_040.c", + "It_los_queue_041.c", + "It_los_queue_042.c", + "It_los_queue_043.c", + "It_los_queue_044.c", + "It_los_queue_045.c", + "It_los_queue_046.c", + "It_los_queue_047.c", + "It_los_queue_048.c", + "It_los_queue_050.c", + "It_los_queue_051.c", + "It_los_queue_052.c", + "It_los_queue_053.c", + "It_los_queue_054.c", + "It_los_queue_055.c", + "It_los_queue_056.c", + "It_los_queue_057.c", + "It_los_queue_058.c", + "It_los_queue_059.c", + "It_los_queue_060.c", + "It_los_queue_061.c", + "It_los_queue_062.c", + "It_los_queue_063.c", + "It_los_queue_064.c", + "It_los_queue_065.c", + "It_los_queue_066.c", + "It_los_queue_067.c", + "It_los_queue_068.c", + "It_los_queue_069.c", + "It_los_queue_070.c", + "It_los_queue_071.c", + "It_los_queue_072.c", + "It_los_queue_073.c", + "It_los_queue_074.c", + "It_los_queue_078.c", + "It_los_queue_079.c", + "It_los_queue_080.c", + "It_los_queue_081.c", + "It_los_queue_082.c", + "It_los_queue_083.c", + "It_los_queue_084.c", + "It_los_queue_085.c", + "It_los_queue_086.c", + "It_los_queue_087.c", + "It_los_queue_088.c", + "It_los_queue_090.c", + "It_los_queue_091.c", + "It_los_queue_092.c", + "It_los_queue_093.c", + "It_los_queue_094.c", + "It_los_queue_095.c", + "It_los_queue_096.c", + "It_los_queue_097.c", + "It_los_queue_104.c", + "It_los_queue_106.c", + "It_los_queue_107.c", + "It_los_queue_108.c", + "It_los_queue_109.c", + "It_los_queue_110.c", + "It_los_queue_114.c", + "It_los_queue_head_001.c", + "It_los_queue_head_002.c", + "It_los_queue_head_003.c", + "It_los_queue_head_004.c", + "It_los_queue_head_005.c", + "It_los_queue_head_006.c", + "It_los_queue_head_007.c", + "It_los_queue_head_008.c", + "It_los_queue_head_009.c", + "It_los_queue_head_010.c", + "It_los_queue_head_011.c", + "It_los_queue_head_012.c", + "It_los_queue_head_013.c", + "It_los_queue_head_014.c", + "It_los_queue_head_015.c", + "It_los_queue_head_016.c", + "It_los_queue_head_019.c", + "It_los_queue_head_020.c", + "It_los_queue_head_021.c", + "It_los_queue_head_022.c", + "It_los_queue_head_023.c", + "It_los_queue_head_024.c", + "It_los_queue_head_025.c", + "It_los_queue_head_026.c", + "It_los_queue_head_027.c", + "It_los_queue_head_028.c", + "It_los_queue_head_029.c", + "It_los_queue_head_030.c", + "It_los_queue_head_031.c", + "It_los_queue_head_032.c", + "It_los_queue_head_038.c", + "It_los_queue_head_039.c", + "It_los_queue_head_040.c", + "It_los_queue_head_041.c", + "It_los_queue_head_042.c", + "LLt_los_queue_003.c", + "Llt_los_queue_001.c", + ] + + configs += [ "//kernel/liteos_m/testsuits:include" ] +} diff --git a/testsuits/sample/kernel/queue/It_los_queue.c b/testsuits/sample/kernel/queue/It_los_queue.c index 7898ccc5..913e3112 100644 --- a/testsuits/sample/kernel/queue/It_los_queue.c +++ b/testsuits/sample/kernel/queue/It_los_queue.c @@ -75,14 +75,6 @@ VOID ItSuiteLosQueue(VOID) ItLosQueue041(); ItLosQueue042(); ItLosQueue043(); -#if (LOS_KERNEL_HWI_TEST == 1) - ItLosQueue044(); - ItLosQueue045(); - ItLosQueue046(); - ItLosQueue047(); - ItLosQueue048(); - ItLosQueue050(); -#endif ItLosQueue051(); ItLosQueue052(); ItLosQueue053(); @@ -123,10 +115,6 @@ VOID ItSuiteLosQueue(VOID) ItLosQueue104(); ItLosQueue106(); ItLosQueue107(); -#if (LOS_KERNEL_HWI_TEST == 1) - ItLosQueue108(); -#endif - ItLosQueue109(); ItLosQueue114(); ItLosQueueHead001(); ItLosQueueHead002(); @@ -164,11 +152,22 @@ VOID ItSuiteLosQueue(VOID) ItLosQueueHead041(); ItLosQueueHead042(); +#if (LOS_KERNEL_TEST_FULL == 1) +#if (LOS_KERNEL_HWI_TEST == 1) + ItLosQueue044(); + ItLosQueue045(); + ItLosQueue046(); + ItLosQueue047(); + ItLosQueue048(); + ItLosQueue050(); + ItLosQueue108(); +#endif + ItLosQueue073(); + ItLosQueue109(); #if (LOSCFG_TEST_LLT == 1) LlTLosQueue001(); LltLosQueue003(); #endif - ItLosQueue073(); ItLosQueue091(); ItLosQueue092(); @@ -176,4 +175,5 @@ VOID ItSuiteLosQueue(VOID) ItLosQueue094(); ItLosQueue095(); ItLosQueue110(); +#endif } diff --git a/testsuits/sample/kernel/sem/BUILD.gn b/testsuits/sample/kernel/sem/BUILD.gn index 5ccc9863..9e1abc95 100644 --- a/testsuits/sample/kernel/sem/BUILD.gn +++ b/testsuits/sample/kernel/sem/BUILD.gn @@ -1,53 +1,52 @@ # Copyright (c) Huawei Technologies Co., Ltd. 2020. All rights reserved. - -static_library("test_sem") { - - sources = [ - "It_los_sem_001.c", - "It_los_sem_002.c", - "It_los_sem_003.c", - "It_los_sem_004.c", - "It_los_sem_005.c", - "It_los_sem_006.c", - "It_los_sem_007.c", - "It_los_sem_008.c", - "It_los_sem_009.c", - "It_los_sem_010.c", - "It_los_sem_011.c", - "It_los_sem_012.c", - "It_los_sem_013.c", - "It_los_sem_014.c", - "It_los_sem_015.c", - "It_los_sem_016.c", - "It_los_sem_017.c", - "It_los_sem_018.c", - "It_los_sem_019.c", - "It_los_sem_020.c", - "It_los_sem_021.c", - "It_los_sem_022.c", - "It_los_sem_023.c", - "It_los_sem_024.c", - "It_los_sem_025.c", - "It_los_sem_026.c", - "It_los_sem_027.c", - "It_los_sem_028.c", - "It_los_sem_029.c", - "It_los_sem_030.c", - "It_los_sem_031.c", - "It_los_sem_032.c", - "It_los_sem_033.c", - "It_los_sem_034.c", - "It_los_sem_035.c", - "It_los_sem_036.c", - "It_los_sem_037.c", - "It_los_sem_038.c", - "It_los_sem_039.c", - "It_los_sem_040.c", - "it_los_sem_041.c", - "it_los_sem_042.c", - "it_los_sem_043.c", - "It_los_sem.c", - ] - - configs += [ "//kernel/liteos_m/testsuits:include" ] -} + +static_library("test_sem") { + sources = [ + "It_los_sem.c", + "It_los_sem_001.c", + "It_los_sem_002.c", + "It_los_sem_003.c", + "It_los_sem_004.c", + "It_los_sem_005.c", + "It_los_sem_006.c", + "It_los_sem_007.c", + "It_los_sem_008.c", + "It_los_sem_009.c", + "It_los_sem_010.c", + "It_los_sem_011.c", + "It_los_sem_012.c", + "It_los_sem_013.c", + "It_los_sem_014.c", + "It_los_sem_015.c", + "It_los_sem_016.c", + "It_los_sem_017.c", + "It_los_sem_018.c", + "It_los_sem_019.c", + "It_los_sem_020.c", + "It_los_sem_021.c", + "It_los_sem_022.c", + "It_los_sem_023.c", + "It_los_sem_024.c", + "It_los_sem_025.c", + "It_los_sem_026.c", + "It_los_sem_027.c", + "It_los_sem_028.c", + "It_los_sem_029.c", + "It_los_sem_030.c", + "It_los_sem_031.c", + "It_los_sem_032.c", + "It_los_sem_033.c", + "It_los_sem_034.c", + "It_los_sem_035.c", + "It_los_sem_036.c", + "It_los_sem_037.c", + "It_los_sem_038.c", + "It_los_sem_039.c", + "It_los_sem_040.c", + "it_los_sem_041.c", + "it_los_sem_042.c", + "it_los_sem_043.c", + ] + + configs += [ "//kernel/liteos_m/testsuits:include" ] +} diff --git a/testsuits/sample/kernel/sem/It_los_sem.c b/testsuits/sample/kernel/sem/It_los_sem.c index 450c4822..e3fda46e 100644 --- a/testsuits/sample/kernel/sem/It_los_sem.c +++ b/testsuits/sample/kernel/sem/It_los_sem.c @@ -43,7 +43,7 @@ VOID ItSuiteLosSem(void) ItLosSem007(); ItLosSem008(); ItLosSem009(); - ItLosSem012(); + ItLosSem011(); ItLosSem013(); ItLosSem014(); ItLosSem015(); @@ -54,33 +54,34 @@ VOID ItSuiteLosSem(void) ItLosSem020(); ItLosSem021(); ItLosSem022(); -#if (LOS_KERNEL_HWI_TEST == 1) - ItLosSem023(); -#endif ItLosSem024(); ItLosSem025(); ItLosSem026(); - ItLosSem027(); ItLosSem028(); ItLosSem029(); -#if (LOS_KERNEL_HWI_TEST == 1) - ItLosSem030(); -#endif #if (LOSCFG_BASE_CORE_SWTMR_ALIGN == YES) ItLosSem031(); #endif ItLosSem032(); + ItLosSem038(); + ItLosSem040(); + ItLosSem041(); + ItLosSem042(); + ItLosSem043(); + +#if (LOS_KERNEL_TEST_FULL == 1) + ItLosSem012(); #if (LOS_KERNEL_HWI_TEST == 1) + ItLosSem010(); + ItLosSem023(); + ItLosSem030(); ItLosSem033(); #endif + ItLosSem027(); ItLosSem034(); ItLosSem035(); ItLosSem036(); ItLosSem037(); - ItLosSem038(); ItLosSem039(); - ItLosSem040(); - ItLosSem041(); - ItLosSem042(); - ItLosSem043(); +#endif } diff --git a/testsuits/sample/kernel/sem/It_los_sem_011.c b/testsuits/sample/kernel/sem/It_los_sem_011.c index 931bf977..a9a1ff3a 100644 --- a/testsuits/sample/kernel/sem/It_los_sem_011.c +++ b/testsuits/sample/kernel/sem/It_los_sem_011.c @@ -42,12 +42,6 @@ static UINT32 Testcase(VOID) LOS_TaskLock(); - ret = LOS_SemPend(g_usSemID, LOS_WAIT_FOREVER); - ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); - - ret = LOS_SemPend(g_usSemID, LOS_WAIT_FOREVER); - ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); - ret = LOS_SemPend(g_usSemID, LOS_WAIT_FOREVER); ICUNIT_GOTO_EQUAL(ret, LOS_ERRNO_SEM_PEND_IN_LOCK, ret, EXIT); diff --git a/testsuits/sample/kernel/swtmr/BUILD.gn b/testsuits/sample/kernel/swtmr/BUILD.gn index 2daac759..18ac0c4a 100644 --- a/testsuits/sample/kernel/swtmr/BUILD.gn +++ b/testsuits/sample/kernel/swtmr/BUILD.gn @@ -1,121 +1,120 @@ # Copyright (c) Huawei Technologies Co., Ltd. 2020. All rights reserved. - -static_library("test_swtmr") { - - sources = [ - "It_los_swtmr_001.c", - "It_los_swtmr_002.c", - "It_los_swtmr_003.c", - "It_los_swtmr_004.c", - "It_los_swtmr_005.c", - "It_los_swtmr_006.c", - "It_los_swtmr_007.c", - "It_los_swtmr_008.c", - "It_los_swtmr_009.c", - "It_los_swtmr_010.c", - "It_los_swtmr_011.c", - "It_los_swtmr_012.c", - "It_los_swtmr_013.c", - "It_los_swtmr_014.c", - "It_los_swtmr_015.c", - "It_los_swtmr_016.c", - "It_los_swtmr_017.c", - "It_los_swtmr_018.c", - "It_los_swtmr_019.c", - "It_los_swtmr_020.c", - "It_los_swtmr_021.c", - "It_los_swtmr_022.c", - "It_los_swtmr_023.c", - "It_los_swtmr_024.c", - "It_los_swtmr_025.c", - "It_los_swtmr_026.c", - "It_los_swtmr_027.c", - "It_los_swtmr_029.c", - "It_los_swtmr_030.c", - "It_los_swtmr_031.c", - "It_los_swtmr_032.c", - "It_los_swtmr_033.c", - "It_los_swtmr_034.c", - "It_los_swtmr_035.c", - "It_los_swtmr_036.c", - "It_los_swtmr_037.c", - "It_los_swtmr_038.c", - "It_los_swtmr_039.c", - "It_los_swtmr_040.c", - "It_los_swtmr_041.c", - "It_los_swtmr_042.c", - "It_los_swtmr_043.c", - "It_los_swtmr_044.c", - "It_los_swtmr_045.c", - "It_los_swtmr_046.c", - "It_los_swtmr_047.c", - "It_los_swtmr_048.c", - "It_los_swtmr_049.c", - "It_los_swtmr_050.c", - "It_los_swtmr_051.c", - "It_los_swtmr_052.c", - "It_los_swtmr_053.c", - "It_los_swtmr_054.c", - "It_los_swtmr_055.c", - "It_los_swtmr_056.c", - "It_los_swtmr_057.c", - "It_los_swtmr_058.c", - "It_los_swtmr_059.c", - "It_los_swtmr_060.c", - "It_los_swtmr_061.c", - "It_los_swtmr_062.c", - "It_los_swtmr_063.c", - "It_los_swtmr_064.c", - "It_los_swtmr_065.c", - "It_los_swtmr_066.c", - "It_los_swtmr_067.c", - "It_los_swtmr_068.c", - "It_los_swtmr_069.c", - "It_los_swtmr_071.c", - "It_los_swtmr_072.c", - "It_los_swtmr_073.c", - "It_los_swtmr_074.c", - "It_los_swtmr_075.c", - "It_los_swtmr_076.c", - "It_los_swtmr_077.c", - "It_los_swtmr_078.c", - "It_los_swtmr_Align_001.c", - "It_los_swtmr_Align_002.c", - "It_los_swtmr_Align_003.c", - "It_los_swtmr_Align_004.c", - "It_los_swtmr_Align_005.c", - "It_los_swtmr_Align_006.c", - "It_los_swtmr_Align_007.c", - "It_los_swtmr_Align_008.c", - "It_los_swtmr_Align_009.c", - "It_los_swtmr_Align_010.c", - "It_los_swtmr_Align_011.c", - "It_los_swtmr_Align_012.c", - "It_los_swtmr_Align_013.c", - "It_los_swtmr_Align_014.c", - "It_los_swtmr_Align_015.c", - "It_los_swtmr_Align_016.c", - "It_los_swtmr_Align_017.c", - "It_los_swtmr_Align_018.c", - "It_los_swtmr_Align_019.c", - "It_los_swtmr_Align_020.c", - "It_los_swtmr_Align_021.c", - "It_los_swtmr_Align_022.c", - "It_los_swtmr_Align_023.c", - "It_los_swtmr_Align_024.c", - "It_los_swtmr_Align_025.c", - "It_los_swtmr_Align_026.c", - "It_los_swtmr_Align_027.c", - "It_los_swtmr_Align_028.c", - "It_los_swtmr_Align_029.c", - "It_los_swtmr_Align_030.c", - "It_los_swtmr_Align_031.c", - "It_los_swtmr.c", - "It_los_swtmr_Delay_001.c", - "It_los_swtmr_Delay_003.c", - "It_los_swtmr_Delay_004.c", - "It_los_swtmr_Delay_005.c", - ] - - configs += [ "//kernel/liteos_m/testsuits:include" ] -} + +static_library("test_swtmr") { + sources = [ + "It_los_swtmr.c", + "It_los_swtmr_001.c", + "It_los_swtmr_002.c", + "It_los_swtmr_003.c", + "It_los_swtmr_004.c", + "It_los_swtmr_005.c", + "It_los_swtmr_006.c", + "It_los_swtmr_007.c", + "It_los_swtmr_008.c", + "It_los_swtmr_009.c", + "It_los_swtmr_010.c", + "It_los_swtmr_011.c", + "It_los_swtmr_012.c", + "It_los_swtmr_013.c", + "It_los_swtmr_014.c", + "It_los_swtmr_015.c", + "It_los_swtmr_016.c", + "It_los_swtmr_017.c", + "It_los_swtmr_018.c", + "It_los_swtmr_019.c", + "It_los_swtmr_020.c", + "It_los_swtmr_021.c", + "It_los_swtmr_022.c", + "It_los_swtmr_023.c", + "It_los_swtmr_024.c", + "It_los_swtmr_025.c", + "It_los_swtmr_026.c", + "It_los_swtmr_027.c", + "It_los_swtmr_029.c", + "It_los_swtmr_030.c", + "It_los_swtmr_031.c", + "It_los_swtmr_032.c", + "It_los_swtmr_033.c", + "It_los_swtmr_034.c", + "It_los_swtmr_035.c", + "It_los_swtmr_036.c", + "It_los_swtmr_037.c", + "It_los_swtmr_038.c", + "It_los_swtmr_039.c", + "It_los_swtmr_040.c", + "It_los_swtmr_041.c", + "It_los_swtmr_042.c", + "It_los_swtmr_043.c", + "It_los_swtmr_044.c", + "It_los_swtmr_045.c", + "It_los_swtmr_046.c", + "It_los_swtmr_047.c", + "It_los_swtmr_048.c", + "It_los_swtmr_049.c", + "It_los_swtmr_050.c", + "It_los_swtmr_051.c", + "It_los_swtmr_052.c", + "It_los_swtmr_053.c", + "It_los_swtmr_054.c", + "It_los_swtmr_055.c", + "It_los_swtmr_056.c", + "It_los_swtmr_057.c", + "It_los_swtmr_058.c", + "It_los_swtmr_059.c", + "It_los_swtmr_060.c", + "It_los_swtmr_061.c", + "It_los_swtmr_062.c", + "It_los_swtmr_063.c", + "It_los_swtmr_064.c", + "It_los_swtmr_065.c", + "It_los_swtmr_066.c", + "It_los_swtmr_067.c", + "It_los_swtmr_068.c", + "It_los_swtmr_069.c", + "It_los_swtmr_071.c", + "It_los_swtmr_072.c", + "It_los_swtmr_073.c", + "It_los_swtmr_074.c", + "It_los_swtmr_075.c", + "It_los_swtmr_076.c", + "It_los_swtmr_077.c", + "It_los_swtmr_078.c", + "It_los_swtmr_Align_001.c", + "It_los_swtmr_Align_002.c", + "It_los_swtmr_Align_003.c", + "It_los_swtmr_Align_004.c", + "It_los_swtmr_Align_005.c", + "It_los_swtmr_Align_006.c", + "It_los_swtmr_Align_007.c", + "It_los_swtmr_Align_008.c", + "It_los_swtmr_Align_009.c", + "It_los_swtmr_Align_010.c", + "It_los_swtmr_Align_011.c", + "It_los_swtmr_Align_012.c", + "It_los_swtmr_Align_013.c", + "It_los_swtmr_Align_014.c", + "It_los_swtmr_Align_015.c", + "It_los_swtmr_Align_016.c", + "It_los_swtmr_Align_017.c", + "It_los_swtmr_Align_018.c", + "It_los_swtmr_Align_019.c", + "It_los_swtmr_Align_020.c", + "It_los_swtmr_Align_021.c", + "It_los_swtmr_Align_022.c", + "It_los_swtmr_Align_023.c", + "It_los_swtmr_Align_024.c", + "It_los_swtmr_Align_025.c", + "It_los_swtmr_Align_026.c", + "It_los_swtmr_Align_027.c", + "It_los_swtmr_Align_028.c", + "It_los_swtmr_Align_029.c", + "It_los_swtmr_Align_030.c", + "It_los_swtmr_Align_031.c", + "It_los_swtmr_Delay_001.c", + "It_los_swtmr_Delay_003.c", + "It_los_swtmr_Delay_004.c", + "It_los_swtmr_Delay_005.c", + ] + + configs += [ "//kernel/liteos_m/testsuits:include" ] +} diff --git a/testsuits/sample/kernel/swtmr/It_los_swtmr.c b/testsuits/sample/kernel/swtmr/It_los_swtmr.c index 5eb6384a..1e0369d8 100644 --- a/testsuits/sample/kernel/swtmr/It_los_swtmr.c +++ b/testsuits/sample/kernel/swtmr/It_los_swtmr.c @@ -60,37 +60,27 @@ VOID ItSuiteLosSwtmr(void) ItLosSwtmr019(); ItLosSwtmr020(); ItLosSwtmr021(); -#if (LOS_KERNEL_HWI_TEST == 1) - ItLosSwtmr022(); - ItLosSwtmr023(); -#endif ItLosSwtmr024(); + ItLosSwtmr027(); +#if (LOSCFG_BASE_CORE_SWTMR_ALIGN == 1) + ItLosSwtmrAlign001(); + ItLosSwtmrAlign002(); + ItLosSwtmrAlign003(); + ItLosSwtmrAlign004(); +#endif + +#if (LOS_KERNEL_TEST_FULL == 1) ItLosSwtmr025(); -#if (LOS_KERNEL_TEST_NOT_SMOKE == 1) ItLosSwtmr026(); -#endif - ItLosSwtmr027(); ItLosSwtmr029(); ItLosSwtmr030(); ItLosSwtmr031(); ItLosSwtmr032(); -#if (LOS_KERNEL_HWI_TEST == 1) - ItLosSwtmr033(); - ItLosSwtmr034(); -#endif ItLosSwtmr035(); ItLosSwtmr036(); ItLosSwtmr037(); ItLosSwtmr038(); -#if (LOS_KERNEL_HWI_TEST == 1) - ItLosSwtmr039(); - ItLosSwtmr040(); - ItLosSwtmr041(); -#endif ItLosSwtmr042(); -#if (LOS_KERNEL_HWI_TEST == 1) - ItLosSwtmr043(); -#endif ItLosSwtmr044(); ItLosSwtmr045(); ItLosSwtmr046(); @@ -111,34 +101,20 @@ VOID ItSuiteLosSwtmr(void) ItLosSwtmr061(); ItLosSwtmr062(); ItLosSwtmr063(); -#if (LOS_KERNEL_HWI_TEST == 1) - ItLosSwtmr064(); - ItLosSwtmr065(); -#endif ItLosSwtmr066(); ItLosSwtmr067(); -#if (LOS_KERNEL_TEST_NOT_SMOKE == 1) ItLosSwtmr068(); ItLosSwtmr069(); -#endif ItLosSwtmr071(); ItLosSwtmr072(); ItLosSwtmr073(); -#if (LOS_KERNEL_TEST_NOT_SMOKE == 1) ItLosSwtmr074(); -#endif ItLosSwtmr075(); ItLosSwtmr076(); ItLosSwtmr077(); ItLosSwtmr078(); #if (LOSCFG_BASE_CORE_SWTMR_ALIGN == 1) - ItLosSwtmrAlign001(); - ItLosSwtmrAlign002(); - ItLosSwtmrAlign003(); - ItLosSwtmrAlign004(); -#if (LOS_KERNEL_TEST_NOT_SMOKE == 1) ItLosSwtmrAlign005(); -#endif ItLosSwtmrAlign006(); ItLosSwtmrAlign007(); ItLosSwtmrAlign008(); @@ -170,5 +146,19 @@ VOID ItSuiteLosSwtmr(void) ItLosSwtmrDelay003(); ItLosSwtmrDelay004(); ItLosSwtmrDelay005(); + +#if (LOS_KERNEL_HWI_TEST == 1) + ItLosSwtmr022(); + ItLosSwtmr023(); + ItLosSwtmr033(); + ItLosSwtmr034(); + ItLosSwtmr039(); + ItLosSwtmr040(); + ItLosSwtmr041(); + ItLosSwtmr043(); + ItLosSwtmr064(); + ItLosSwtmr065(); +#endif +#endif } diff --git a/testsuits/sample/kernel/swtmr/It_los_swtmr_002.c b/testsuits/sample/kernel/swtmr/It_los_swtmr_002.c index b5ba8595..8b34709a 100644 --- a/testsuits/sample/kernel/swtmr/It_los_swtmr_002.c +++ b/testsuits/sample/kernel/swtmr/It_los_swtmr_002.c @@ -64,7 +64,9 @@ static UINT32 Testcase(VOID) ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); // 2, Here, assert that g_testCount is equal to this . - ICUNIT_GOTO_EQUAL(g_testCount, 2, g_testCount, EXIT); + if (g_testCount < 2) { + ICUNIT_GOTO_EQUAL(g_testCount, 2, g_testCount, EXIT); // 2, Here, assert that g_testCount is equal to this + } ret = LOS_SwtmrDelete(swTmrID); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); @@ -73,7 +75,9 @@ static UINT32 Testcase(VOID) ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); // 2, Here, assert that g_testCount is equal to this . - ICUNIT_ASSERT_EQUAL(g_testCount, 2, g_testCount); + if (g_testCount < 2) { + ICUNIT_ASSERT_EQUAL(g_testCount, 2, g_testCount); // 2, Here, assert that g_testCount is equal to this + } return LOS_OK; @@ -84,7 +88,7 @@ EXIT: return LOS_OK; } -VOID ItLosSwtmr002() // IT_Layer_ModuleORFeature_No +VOID ItLosSwtmr002(VOID) // IT_Layer_ModuleORFeature_No { TEST_ADD_CASE("ItLosSwtmr002", Testcase, TEST_LOS, TEST_SWTMR, TEST_LEVEL1, TEST_FUNCTION); } diff --git a/testsuits/sample/kernel/swtmr/It_los_swtmr_013.c b/testsuits/sample/kernel/swtmr/It_los_swtmr_013.c index 1ecdcf8c..d80ac4d4 100644 --- a/testsuits/sample/kernel/swtmr/It_los_swtmr_013.c +++ b/testsuits/sample/kernel/swtmr/It_los_swtmr_013.c @@ -62,10 +62,11 @@ static UINT32 Testcase(VOID) ret = LOS_TaskDelay(10); // 10, set delay time. ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); - - // 2, Here, assert that g_testCount is equal to this . - ICUNIT_GOTO_EQUAL(g_testCount, 2, g_testCount, EXIT); + // 2, Here, assert that g_testCount is equal to this . + if (g_testCount < 2) { + ICUNIT_GOTO_EQUAL(g_testCount, 2, g_testCount, EXIT); // 2, Here, assert that g_testCount is equal to this + } EXIT: ret = LOS_SwtmrDelete(swTmrID); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); @@ -73,7 +74,7 @@ EXIT: return LOS_OK; } -VOID ItLosSwtmr013() // IT_Layer_ModuleORFeature_No +VOID ItLosSwtmr013(VOID) // IT_Layer_ModuleORFeature_No { TEST_ADD_CASE("ItLosSwtmr013", Testcase, TEST_LOS, TEST_SWTMR, TEST_LEVEL2, TEST_FUNCTION); } diff --git a/testsuits/sample/kernel/swtmr/It_los_swtmr_016.c b/testsuits/sample/kernel/swtmr/It_los_swtmr_016.c index 84aab7c1..b63cb3c6 100644 --- a/testsuits/sample/kernel/swtmr/It_los_swtmr_016.c +++ b/testsuits/sample/kernel/swtmr/It_los_swtmr_016.c @@ -67,8 +67,9 @@ static UINT32 Testcase(VOID) ret = LOS_TaskDelay(10); // 10, set delay time. ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); // 2, Here, assert that g_testCount is equal to this . - ICUNIT_GOTO_EQUAL(g_testCount, 2, g_testCount, EXIT); - + if (g_testCount < 2) { + ICUNIT_GOTO_EQUAL(g_testCount, 2, g_testCount, EXIT); // 2, Here, assert that g_testCount is equal to this + } EXIT: ret = LOS_SwtmrDelete(swTmrID); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); @@ -76,7 +77,7 @@ EXIT: return LOS_OK; } -VOID ItLosSwtmr016() // IT_Layer_ModuleORFeature_No +VOID ItLosSwtmr016(VOID) // IT_Layer_ModuleORFeature_No { TEST_ADD_CASE("ItLosSwtmr016", Testcase, TEST_LOS, TEST_SWTMR, TEST_LEVEL2, TEST_FUNCTION); } diff --git a/testsuits/sample/kernel/swtmr/It_los_swtmr_021.c b/testsuits/sample/kernel/swtmr/It_los_swtmr_021.c index daf3e0f6..e10c3078 100644 --- a/testsuits/sample/kernel/swtmr/It_los_swtmr_021.c +++ b/testsuits/sample/kernel/swtmr/It_los_swtmr_021.c @@ -70,10 +70,11 @@ static UINT32 Testcase(VOID) ret = LOS_TaskDelay(10); // 10, set delay time. ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); - - // 2, Here, assert that g_testCount is equal to this . - ICUNIT_GOTO_EQUAL(g_testCount, 2, g_testCount, EXIT); + // 2, Here, assert that g_testCount is equal to this . + if (g_testCount < 2) { + ICUNIT_GOTO_EQUAL(g_testCount, 2, g_testCount, EXIT); // 2, Here, assert that g_testCount is equal to this + } EXIT: ret = LOS_SwtmrDelete(swTmrID); ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret); @@ -81,7 +82,7 @@ EXIT: return LOS_OK; } -VOID ItLosSwtmr021() // IT_Layer_ModuleORFeature_No +VOID ItLosSwtmr021(VOID) // IT_Layer_ModuleORFeature_No { TEST_ADD_CASE("ItLosSwtmr021", Testcase, TEST_LOS, TEST_SWTMR, TEST_LEVEL2, TEST_FUNCTION); } diff --git a/testsuits/sample/kernel/swtmr/It_los_swtmr_Align_003.c b/testsuits/sample/kernel/swtmr/It_los_swtmr_Align_003.c index 13bd7dad..4b3cd403 100644 --- a/testsuits/sample/kernel/swtmr/It_los_swtmr_Align_003.c +++ b/testsuits/sample/kernel/swtmr/It_los_swtmr_Align_003.c @@ -55,7 +55,7 @@ static UINT32 Testcase(VOID) ret = LOS_SwtmrStart(swTmrID); ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); - ret = LOS_TaskDelay(4); // 4, set delay time. + ret = LOS_TaskDelay(5); // 5, set delay time. ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT); ICUNIT_GOTO_EQUAL(g_testCount, 1, g_testCount, EXIT); diff --git a/testsuits/sample/kernel/task/BUILD.gn b/testsuits/sample/kernel/task/BUILD.gn index 51cc6c1b..6afb8f6d 100644 --- a/testsuits/sample/kernel/task/BUILD.gn +++ b/testsuits/sample/kernel/task/BUILD.gn @@ -1,124 +1,123 @@ # Copyright (c) Huawei Technologies Co., Ltd. 2020. All rights reserved. - -static_library("test_task") { - - sources = [ - "It_los_task.c", - "It_los_task_001.c", - "It_los_task_002.c", - "It_los_task_003.c", - "It_los_task_004.c", - "It_los_task_005.c", - "It_los_task_006.c", - "It_los_task_007.c", - "It_los_task_008.c", - "It_los_task_010.c", - "It_los_task_011.c", - "It_los_task_012.c", - "It_los_task_013.c", - "It_los_task_014.c", - "It_los_task_015.c", - "It_los_task_016.c", - "It_los_task_017.c", - "It_los_task_018.c", - "It_los_task_019.c", - "It_los_task_020.c", - "It_los_task_021.c", - "It_los_task_022.c", - "It_los_task_023.c", - "It_los_task_024.c", - "It_los_task_025.c", - "It_los_task_026.c", - "It_los_task_027.c", - "It_los_task_028.c", - "It_los_task_029.c", - "It_los_task_030.c", - "It_los_task_031.c", - "It_los_task_032.c", - "It_los_task_033.c", - "It_los_task_034.c", - "It_los_task_035.c", - "It_los_task_036.c", - "It_los_task_037.c", - "It_los_task_038.c", - "It_los_task_039.c", - "It_los_task_040.c", - "It_los_task_041.c", - "It_los_task_042.c", - "It_los_task_043.c", - "It_los_task_046.c", - "It_los_task_047.c", - "It_los_task_048.c", - "It_los_task_049.c", - "It_los_task_050.c", - "It_los_task_051.c", - "It_los_task_052.c", - "It_los_task_053.c", - "It_los_task_054.c", - "It_los_task_055.c", - "It_los_task_056.c", - "It_los_task_057.c", - "It_los_task_058.c", - "It_los_task_059.c", - "It_los_task_060.c", - "It_los_task_061.c", - "It_los_task_062.c", - "It_los_task_063.c", - "It_los_task_064.c", - "It_los_task_065.c", - "It_los_task_066.c", - "It_los_task_067.c", - "It_los_task_068.c", - "It_los_task_069.c", - "It_los_task_070.c", - "It_los_task_071.c", - "It_los_task_072.c", - "It_los_task_073.c", - "It_los_task_074.c", - "It_los_task_075.c", - "It_los_task_076.c", - "It_los_task_077.c", - "It_los_task_078.c", - "It_los_task_079.c", - "It_los_task_080.c", - "It_los_task_081.c", - "It_los_task_082.c", - "It_los_task_083.c", - "It_los_task_084.c", - "It_los_task_085.c", - "It_los_task_086.c", - "It_los_task_087.c", - "It_los_task_088.c", - "It_los_task_089.c", - "It_los_task_090.c", - "It_los_task_091.c", - "It_los_task_092.c", - "It_los_task_093.c", - "It_los_task_094.c", - "It_los_task_095.c", - "It_los_task_096.c", - "It_los_task_097.c", - "It_los_task_098.c", - "It_los_task_099.c", - "It_los_task_100.c", - "It_los_task_101.c", - "It_los_task_102.c", - "It_los_task_103.c", - "It_los_task_104.c", - "It_los_task_105.c", - "It_los_task_106.c", - "It_los_task_107.c", - "It_los_task_108.c", - "It_los_task_109.c", - "It_los_task_110.c", - "It_los_task_111.c", - "It_los_task_112.c", - "It_los_task_113.c", - "It_los_task_114.c", - "It_los_task_115.c", - "It_los_task_116.c", - "It_los_task_117.c", - ] - - configs += [ "//kernel/liteos_m/testsuits:include" ] -} + +static_library("test_task") { + sources = [ + "It_los_task.c", + "It_los_task_001.c", + "It_los_task_002.c", + "It_los_task_003.c", + "It_los_task_004.c", + "It_los_task_005.c", + "It_los_task_006.c", + "It_los_task_007.c", + "It_los_task_008.c", + "It_los_task_010.c", + "It_los_task_011.c", + "It_los_task_012.c", + "It_los_task_013.c", + "It_los_task_014.c", + "It_los_task_015.c", + "It_los_task_016.c", + "It_los_task_017.c", + "It_los_task_018.c", + "It_los_task_019.c", + "It_los_task_020.c", + "It_los_task_021.c", + "It_los_task_022.c", + "It_los_task_023.c", + "It_los_task_024.c", + "It_los_task_025.c", + "It_los_task_026.c", + "It_los_task_027.c", + "It_los_task_028.c", + "It_los_task_029.c", + "It_los_task_030.c", + "It_los_task_031.c", + "It_los_task_032.c", + "It_los_task_033.c", + "It_los_task_034.c", + "It_los_task_035.c", + "It_los_task_036.c", + "It_los_task_037.c", + "It_los_task_038.c", + "It_los_task_039.c", + "It_los_task_040.c", + "It_los_task_041.c", + "It_los_task_042.c", + "It_los_task_043.c", + "It_los_task_046.c", + "It_los_task_047.c", + "It_los_task_048.c", + "It_los_task_049.c", + "It_los_task_050.c", + "It_los_task_051.c", + "It_los_task_052.c", + "It_los_task_053.c", + "It_los_task_054.c", + "It_los_task_055.c", + "It_los_task_056.c", + "It_los_task_057.c", + "It_los_task_058.c", + "It_los_task_059.c", + "It_los_task_060.c", + "It_los_task_061.c", + "It_los_task_062.c", + "It_los_task_063.c", + "It_los_task_064.c", + "It_los_task_065.c", + "It_los_task_066.c", + "It_los_task_067.c", + "It_los_task_068.c", + "It_los_task_069.c", + "It_los_task_070.c", + "It_los_task_071.c", + "It_los_task_072.c", + "It_los_task_073.c", + "It_los_task_074.c", + "It_los_task_075.c", + "It_los_task_076.c", + "It_los_task_077.c", + "It_los_task_078.c", + "It_los_task_079.c", + "It_los_task_080.c", + "It_los_task_081.c", + "It_los_task_082.c", + "It_los_task_083.c", + "It_los_task_084.c", + "It_los_task_085.c", + "It_los_task_086.c", + "It_los_task_087.c", + "It_los_task_088.c", + "It_los_task_089.c", + "It_los_task_090.c", + "It_los_task_091.c", + "It_los_task_092.c", + "It_los_task_093.c", + "It_los_task_094.c", + "It_los_task_095.c", + "It_los_task_096.c", + "It_los_task_097.c", + "It_los_task_098.c", + "It_los_task_099.c", + "It_los_task_100.c", + "It_los_task_101.c", + "It_los_task_102.c", + "It_los_task_103.c", + "It_los_task_104.c", + "It_los_task_105.c", + "It_los_task_106.c", + "It_los_task_107.c", + "It_los_task_108.c", + "It_los_task_109.c", + "It_los_task_110.c", + "It_los_task_111.c", + "It_los_task_112.c", + "It_los_task_113.c", + "It_los_task_114.c", + "It_los_task_115.c", + "It_los_task_116.c", + "It_los_task_117.c", + ] + + configs += [ "//kernel/liteos_m/testsuits:include" ] +} diff --git a/testsuits/sample/kernel/task/It_los_task.c b/testsuits/sample/kernel/task/It_los_task.c index 90173254..6cf299e0 100644 --- a/testsuits/sample/kernel/task/It_los_task.c +++ b/testsuits/sample/kernel/task/It_los_task.c @@ -72,65 +72,45 @@ VOID ItSuiteLosTask() ItLosTask036(); ItLosTask037(); ItLosTask038(); - ItLosTask039(); - ItLosTask040(); ItLosTask041(); ItLosTask042(); - ItLosTask043(); ItLosTask046(); ItLosTask047(); - ItLosTask048(); ItLosTask049(); ItLosTask050(); - ItLosTask051(); - ItLosTask052(); -#if (LOS_KERNEL_HWI_TEST == 1) - ItLosTask053(); - ItLosTask054(); -#endif ItLosTask055(); - ItLosTask056(); ItLosTask057(); ItLosTask058(); -#if (LOS_KERNEL_HWI_TEST == 1) - ItLosTask059(); -#endif ItLosTask060(); -#if (LOS_KERNEL_HWI_TEST == 1) - ItLosTask061(); -#endif ItLosTask062(); - ItLosTask063(); -#if (LOS_KERNEL_HWI_TEST == 1) - ItLosTask064(); -#endif ItLosTask065(); ItLosTask066(); ItLosTask067(); ItLosTask068(); ItLosTask069(); -#if (LOS_KERNEL_HWI_TEST == 1) - ItLosTask070(); -#endif ItLosTask071(); ItLosTask072(); ItLosTask073(); ItLosTask074(); - ItLosTask075(); ItLosTask076(); ItLosTask077(); ItLosTask078(); + +#if (LOS_KERNEL_TEST_FULL == 1) + ItLosTask039(); + ItLosTask040(); + ItLosTask043(); + ItLosTask048(); + ItLosTask051(); + ItLosTask052(); + ItLosTask056(); + ItLosTask063(); + ItLosTask075(); ItLosTask079(); -#if (LOS_KERNEL_HWI_TEST == 1) - ItLosTask080(); -#endif ItLosTask081(); ItLosTask082(); ItLosTask083(); ItLosTask085(); -#if (LOS_KERNEL_HWI_TEST == 1) - ItLosTask086(); -#endif ItLosTask087(); ItLosTask088(); ItLosTask089(); @@ -144,15 +124,9 @@ VOID ItSuiteLosTask() ItLosTask099(); ItLosTask100(); ItLosTask101(); -#if (LOS_KERNEL_HWI_TEST == 1) - ItLosTask102(); -#endif ItLosTask103(); ItLosTask104(); ItLosTask105(); -#if (LOS_KERNEL_HWI_TEST == 1) - ItLosTask106(); -#endif ItLosTask107(); ItLosTask108(); ItLosTask109(); @@ -160,13 +134,22 @@ VOID ItSuiteLosTask() ItLosTask111(); ItLosTask112(); ItLosTask113(); -#if (LOS_KERNEL_HWI_TEST == 1) - ItLosTask114(); -#endif ItLosTask115(); ItLosTask116(); #if (LOS_KERNEL_HWI_TEST == 1) + ItLosTask053(); + ItLosTask054(); + ItLosTask059(); + ItLosTask061(); + ItLosTask064(); + ItLosTask070(); + ItLosTask080(); + ItLosTask086(); + ItLosTask102(); + ItLosTask106(); + ItLosTask114(); ItLosTask117(); #endif +#endif } diff --git a/testsuits/unittest/posix/BUILD.gn b/testsuits/unittest/posix/BUILD.gn index bf9875d2..ac493392 100644 --- a/testsuits/unittest/posix/BUILD.gn +++ b/testsuits/unittest/posix/BUILD.gn @@ -32,33 +32,33 @@ import("//test/xts/tools/lite/build/suite_lite.gni") hctest_suite("PosixTest") { suite_name = "acts" sources = [ - "src/mqueue/mqueue_func_test.c", - "src/pthread/pthread_cond_func_test.c", - "src/semaphore/semaphore_func_test.c", + "src/ctype/ctype_func_test.c", "src/ctype/isdigit_test.c", "src/ctype/islower_test.c", "src/ctype/isxdigit_test.c", - "src/ctype/ctype_func_test.c", "src/ctype/tolower_test.c", "src/ctype/toupper_test.c", + "src/errno/strerror_test.c", + "src/fs/posix_fs_func_test.c", "src/math/math_func_test.c", + "src/mqueue/mqueue_func_test.c", + "src/pthread/pthread_cond_func_test.c", "src/regex/regex_func_test.c", + "src/semaphore/semaphore_func_test.c", "src/stdarg/stdarg_func_test.c", "src/stdlib/atoi_test.c", - "src/stdlib/atoll_test.c", "src/stdlib/atol_test.c", + "src/stdlib/atoll_test.c", "src/stdlib/strtol_test.c", - "src/stdlib/strtoull_test.c", "src/stdlib/strtoul_test.c", + "src/stdlib/strtoull_test.c", "src/string/memory_func_test.c", + "src/string/strchr_test.c", "src/string/string_func_test_01.c", "src/string/string_func_test_02.c", - "src/string/strchr_test.c", + "src/string/string_func_test_03.c", "src/string/strstr_test.c", "src/time/time_func_test_01.c", - "src/fs/posix_fs_func_test.c", - "src/string/string_func_test_03.c", - "src/errno/strerror_test.c", ] include_dirs = [ -- GitLab