Merge branch 'master' of gitee.com:openharmony/kernel_liteos_a into master

testsuites/Kconfig

@@ -45,6 +45,5 @@ config TEST
     depends on KERNEL_TEST
 
 source "./kernel/Kconfig"
-source "./kernel/Kconfig_case"
 endmenu
 

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_

testsuites/kernel/Kconfig

@@ -43,20 +43,6 @@ config TEST_FULL
     default y
     depends on TEST && TEST_LEVEL
 
-config TEST_PRESSURE
-    bool "Enable Test Pressure"
-    default n
-    depends on TEST && TEST_LEVEL
-
-config TEST_LLT
-    bool "Enable Test LLT"
-    default n
-    depends on TEST && TEST_LEVEL
-
-config TEST_MUTIL
-    bool "Enable Multi Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST
 config TEST_KERNEL_BASE
     bool "Enable Kernel Testsuit"
     default y
@@ -69,90 +55,18 @@ config TEST_KERNEL_BASE_CORE
     bool "Enable CORE Testsuit"
     default y
     depends on KERNEL_TEST &&  TEST_KERNEL_BASE && TEST
-config TEST_KERNEL_BASE_MP
-    bool "Enable MP Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST_KERNEL_BASE && TEST && KERNEL_SMP
-config TEST_KERNEL_BASE_MEM
-    bool "Enable MEM Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST_KERNEL_BASE && TEST
-config TEST_KERNEL_BASE_VM
-    bool "Enable VM Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST_KERNEL_BASE && TEST
-config TEST_KERNEL_BASE_MISC
-    bool "Enable MISC Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST_KERNEL_BASE && TEST
-config TEST_KERNEL_BASE_OM
-    bool "Enable OM Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST_KERNEL_BASE && TEST
-config TEST_KERNEL_BASE_ATOMIC
-    bool "Enable ATOMIC Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST_KERNEL_BASE && TEST
 config TEST_KERNEL_EXTEND
     bool "Enable Extended Kernel Testsuit"
     default y
     depends on KERNEL_TEST &&  TEST
-config TEST_KERNEL_EXTEND_CPP
-    bool "Enable CPP Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST_KERNEL_EXTEND && TEST
 config TEST_KERNEL_EXTEND_CPUP
     bool "Enable CPUP Testsuit"
     default y
     depends on KERNEL_TEST &&  TEST_KERNEL_EXTEND && TEST
-config TEST_KERNEL_EXTEND_EXC
-    bool "Enable EXC Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST_KERNEL_EXTEND && TEST
-config TEST_KERNEL_EXTEND_UNALIGNACCESS
-    bool "Enable UNALIGNACCESS Testsuit"
-    default n
-    depends on KERNEL_TEST &&  DO_ALIGN && TEST_KERNEL_EXTEND && TEST
-config TEST_KERNEL_EXTEND_MMU
-    bool "Enable MMU Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST_KERNEL_EXTEND && TEST
-config TEST_KERNEL_EXTEND_DYNLOAD
-    bool "Enable DYNLOAD Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST_KERNEL_EXTEND && TEST
-config TEST_KERNEL_EXTEND_MPU
-    bool "Enable MPU Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST_KERNEL_EXTEND && TEST
-config TEST_KERNEL_EXTEND_RUNSTOP
-    bool "Enable RUNSTOP Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST_KERNEL_EXTEND  && KERNEL_RUNSTOP && TEST
-config TEST_KERNEL_EXTEND_SCATTER
-    bool "Enable SCATTER Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST_KERNEL_EXTEND  && KERNEL_SCATTER && TEST
-config TEST_KERNEL_EXTEND_TICKLESS
-    bool "Enable TICKLESS Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST_KERNEL_EXTEND && TEST
-config TEST_KERNEL_EXTEND_TRACE
-    bool "Enable TRACE Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST_KERNEL_EXTEND && TEST
 config TEST_POSIX
     bool "Enable Posix Testsuit"
     default y
     depends on KERNEL_TEST &&  TEST
-config TEST_POSIX_MEM
-    bool "Enable Mem Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST_POSIX && TEST
-config TEST_POSIX_MQUEUE
-    bool "Enable Mqueue Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST_POSIX && TEST
 config TEST_POSIX_MUTEX
     bool "Enable Mutex Testsuit"
     default y
@@ -161,266 +75,5 @@ config TEST_POSIX_PTHREAD
     bool "Enable Pthread Testsuit"
     default y
     depends on KERNEL_TEST &&  TEST_POSIX && TEST
-config TEST_POSIX_SCHED
-    bool "Enable Sched Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST_POSIX && TEST
-config TEST_POSIX_SEM
-    bool "Enable Sem Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST_POSIX && TEST
-config TEST_POSIX_SWTMR
-    bool "Enable Swtmr Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST_POSIX && TEST
-config TEST_LINUX
-    bool "Enable Linux Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST
-config TEST_LINUX_HRTIMER
-    bool "Enable Hrtimer Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST_LINUX && TEST
-config TEST_FS
-    bool "Enable FS Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST
-
-config TEST_FS_VFS
-    bool "Enable VFS Test"
-    default n
-    depends on KERNEL_TEST &&  TEST_FS && TEST
-config TEST_FS_JFFS
-    bool "Enable JFFS Test"
-    default n
-    depends on KERNEL_TEST &&  TEST_FS && TEST
-config TEST_FS_RAMFS
-    bool "Enable RAMFS Test"
-    default n
-    depends on KERNEL_TEST &&  TEST_FS && TEST
-
-config TEST_FS_FAT
-    bool "Enable FAT Test"
-    default n
-    depends on KERNEL_TEST &&  TEST_FS && TEST
-config TEST_FS_FAT_FAT32
-    bool "Enable FAT32 Test"
-    default n
-    depends on KERNEL_TEST &&  TEST_FS_FAT && TEST
-config TEST_FAT32_FSCK
-    bool "Enable FAT32 Fsck Test"
-    default n
-    depends on KERNEL_TEST &&  TEST_FS_FAT && TEST
-
-config TEST_FS_VIRPART
-    bool "Enable FAT virtual partition test"
-    default n
-    depends on KERNEL_TEST &&  FS_FAT_VIRTUAL_PARTITION && TEST_FS && TEST
-config TEST_FS_PROC
-    bool "Enable PROC Test"
-    default n
-    depends on KERNEL_TEST &&  TEST_FS && TEST
-config TEST_FS_NFS
-    bool "Enable NFS Test"
-    default n
-    depends on KERNEL_TEST &&  TEST_FS && TEST
-config TEST_MTD
-    bool "Enable MTD Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST
-
-config TEST_MTD_JFFS
-    bool "Enable JFFS MTD Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST_MTD && TEST
-
-config TEST_MTD_FAT
-    bool "Enable FAT MTD Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST_MTD && !FS_FAT_VIRTUAL_PARTITION && TEST
-
-config TEST_MTD_DISK
-    bool "Enable FAT MTD DISK Test"
-    default n
-    depends on KERNEL_TEST &&   TEST_MTD && !FS_FAT_VIRTUAL_PARTITION && TEST
-
-config TEST_MTD_FAT_VIRPART
-    bool "Enable FAT virtual partition MTD test"
-    default n
-    depends on KERNEL_TEST &&  TEST_MTD && FS_FAT_VIRTUAL_PARTITION && TEST
-
-config TEST_DRIVERBASE
-    bool "Enable DriverBase Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST
-config TEST_LIBC
-    bool "Enable LIBC Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST
-config TEST_LIBM
-    bool "Enable LIBM Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST
-
-config TEST_SHELL
-    bool "Enable Shell Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST
-config TEST_USB
-    bool "Enable Usb Manual Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST && DRIVERS_USB
-    help
-
-config TEST_HOST_MASS_DEVICE
-    bool "Enable Host Mass Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST_USB && DRIVERS_USB_MASS_STORAGE && TEST
-config TEST_HOST_UVC
-    bool "Enable Host UVC Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST_USB && DRIVERS_USB_HOST_UVC && TEST
-
-config TEST_DEVICE_MASS_GADGET
-    bool "Enable Device Mass Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST_USB && DRIVERS_USB_MASS_STORAGE_GADGET && TEST
-config TEST_UVC_GADGET
-    bool "Enable UVC Gadget Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST_USB && DRIVERS_USB_UVC_GADGET && TEST
-config TEST_UAC_GADGET
-    bool "Enable UAC Gadget Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST_USB && DRIVERS_USB_UAC_GADGET && TEST
-
-config TEST_CAMERA_GADGET
-    bool "Enable Camera Gadget Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST_USB && DRIVERS_USB_CAMERA_GADGET && TEST
-config TEST_HUB_GADGET
-    bool "Enable HUB Gadget Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST_USB && TEST
-config TEST_SERIAL_GADGET
-    bool "Enable Serial Gadget Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST_USB && DRIVERS_USB_SERIAL_GADGET && TEST
-config TEST_HID_GADGET
-    bool "Enable HID Gadget Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST_USB && DRIVERS_USB_HID_GADGET && TEST
-config TEST_ETHERNET_GADGET
-    bool "Enable Ethernet Gadget Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST_USB && DRIVERS_USB_ETHERNET_GADGET && TEST
-config TEST_MULTI_GADGET
-    bool "Enable Ethernet & Serial Gadget Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST_USB && DRIVERS_USB_ETH_SER_GADGET && TEST
-config TEST_DFU_GADGET
-    bool "Enable Drivers DFU Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST_USB && DRIVERS_USB_DFU_GADGET && TEST
-config TEST_MUTILDEVICE_GADGET
-    bool "Enable Drivers Multidevices Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST_USB && TEST
-config TEST_SMP_USB
-    bool "Enable Usb SMP Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST_USB && TEST && KERNEL_SMP
-config TEST_HOST_ETH
-    bool "Enable Host Eth Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST_USB && TEST
-
-config TEST_AUTO_USB
-    bool "Enable Usb Auto Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST && DRIVERS_USB
-
-config TEST_MMC
-    bool "Enable MMC Testsuit"
-    default n
-    depends on KERNEL_TEST &&  DRIVERS_MMC && TEST
-
-config TEST_SD
-    bool "Enable SD Testsuit"
-    default n
-    depends on KERNEL_TEST &&  DRIVERS_MMC && TEST_MMC && TEST
-
-config TEST_SDIO
-    bool "Enable SDIO Testsuit"
-    default n
-    depends on KERNEL_TEST &&  DRIVERS_MMC && TEST_MMC && TEST
-
-comment "Only one platform can be selected"
-    depends on KERNEL_TEST &&  DRIVERS_MMC && TEST_MMC && TEST && TEST_SDIO
-config TEST_SDIO_1131S
-    depends on KERNEL_TEST &&  DRIVERS_MMC && TEST_MMC && TEST && TEST_SDIO
-    bool "1131s"
-config TEST_SDIO_RTL8189
-    depends on KERNEL_TEST &&  DRIVERS_MMC && TEST_MMC && TEST && TEST_SDIO
-    bool "RTL8189"
-
-config TEST_PERFORMANCE
-    bool "Enable Performance Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST
-config TEST_PERFORMANCE_CORE
-    bool "Enable Performance CORE Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST_PERFORMANCE && TEST
-config TEST_PERFORMANCE_MEM
-    bool "Enable Performance MEM Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST_PERFORMANCE && TEST
-config TEST_PERFORMANCE_FS
-    bool "Enable Performance FS Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST_PERFORMANCE && TEST
-config TEST_PERFORMANCE_USB
-    bool "Enable Performance USB Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST_PERFORMANCE && TEST
-config TEST_PERFORMANCE_NET
-    bool "Enable Performance NET Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST_PERFORMANCE && TEST
-
-config TEST_NET
-    bool "Enable NET Test"
-    default n
-    depends on KERNEL_TEST &&  TEST
-    help
-    Attention: if this option turns on, other test suits will be ignored.
-config TEST_LWIP
-    bool "Enable LWIP Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST_NET && TEST
-config AR6K3_WIFI_TEST
-    bool "Enable AR6K3_WIFI Test"
-    default n
-    depends on KERNEL_TEST &&  TEST && DRIVERS_WIFI_QRD
-    help
-    Attention: if this option turns on, other test suits will be ignored.
-config BCM_WIFI_TEST
-    bool "Enable BCM_WIFI Test"
-    default n
-    depends on KERNEL_TEST &&  TEST && DRIVERS_WIFI_BCM
-    help
-    Attention: if this option turns on, other test suits will be ignored.
-
-config TEST_PLATFORM
-    bool "Enable Platform Testsuit"
-    default n
-    depends on KERNEL_TEST &&  TEST
-config 3RDPARTY_TEST
-    bool "Enable 3rdParty Test"
-    default n
-    depends on KERNEL_TEST &&  TEST && 3RDPARTY
-    help
-    Attention: 3rdParty tools and libs test
 
 

testsuites/kernel/Kconfig_case

@@ -1,387 +0,0 @@
-# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
-# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this list of
-# conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list
-# of conditions and the following disclaimer in the documentation and/or other materials
-# provided with the distribution.
-#
-# 3. Neither the name of the copyright holder nor the names of its contributors may be used
-# to endorse or promote products derived from this software without specific prior written
-# permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-config LOSCFG_TEST_LEVEL
-    int "Test Level"
-    default 2
-    depends on LOSCFG_TESTSUIT_SHELL
-    help
-    Attention:
-    0:smoke test
-    1:llt test
-    2:full test
-    3:presssure test
-config LOSCFG_TEST_KERNEL_BASE
-    bool "Enable Kernel Testsuit"
-    default n
-    depends on  LOSCFG_TESTSUIT_SHELL
-config LOSCFG_TEST_KERNEL_BASE_IPC
-    bool "Enable IPC Testsuit"
-    default n
-    depends on LOSCFG_TEST_KERNEL_BASE && LOSCFG_TESTSUIT_SHELL
-config LOSCFG_TEST_KERNEL_BASE_CORE
-    bool "Enable CORE Testsuit"
-    default n
-    depends on LOSCFG_TEST_KERNEL_BASE && LOSCFG_TESTSUIT_SHELL
-config LOSCFG_TEST_KERNEL_BASE_MEM
-    bool "Enable MEM Testsuit"
-    default n
-    depends on LOSCFG_TEST_KERNEL_BASE && LOSCFG_TESTSUIT_SHELL
-config LOSCFG_TEST_KERNEL_BASE_VM
-    bool "Enable VM Testsuit"
-    default n
-    depends on LOSCFG_TEST_KERNEL_BASE && LOSCFG_TESTSUIT_SHELL
-config LOSCFG_TEST_KERNEL_BASE_MISC
-    bool "Enable MISC Testsuit"
-    default n
-    depends on LOSCFG_TEST_KERNEL_BASE && LOSCFG_TESTSUIT_SHELL
-config LOSCFG_TEST_KERNEL_BASE_OM
-    bool "Enable OM Testsuit"
-    default n
-    depends on LOSCFG_TEST_KERNEL_BASE && LOSCFG_TESTSUIT_SHELL
-config LOSCFG_TEST_KERNEL_BASE_ATOMIC
-    bool "Enable ATOMIC Testsuit"
-    default n
-    depends on LOSCFG_TEST_KERNEL_BASE && LOSCFG_TESTSUIT_SHELL
-config LOSCFG_TEST_KERNEL_EXTEND
-    bool "Enable Extended Kernel Testsuit"
-    default n
-    depends on  LOSCFG_TESTSUIT_SHELL
-config LOSCFG_TEST_KERNEL_EXTEND_CPP
-    bool "Enable CPP Testsuit"
-    default n
-    depends on LOSCFG_TEST_KERNEL_EXTEND && LOSCFG_TESTSUIT_SHELL
-config LOSCFG_TEST_KERNEL_EXTEND_CPUP
-    bool "Enable CPUP Testsuit"
-    default n
-    depends on LOSCFG_TEST_KERNEL_EXTEND && LOSCFG_TESTSUIT_SHELL
-config LOSCFG_TEST_KERNEL_EXTEND_EXC
-    bool "Enable EXC Testsuit"
-    default n
-    depends on LOSCFG_TEST_KERNEL_EXTEND && LOSCFG_TESTSUIT_SHELL
-config LOSCFG_TEST_KERNEL_EXTEND_UNALIGNACCESS
-    bool "Enable UNALIGNACCESS Testsuit"
-    default n
-    depends on LOSCFG_DO_ALIGN && LOSCFG_TEST_KERNEL_EXTEND && LOSCFG_TESTSUIT_SHELL
-config LOSCFG_TEST_KERNEL_EXTEND_MMU
-    bool "Enable MMU Testsuit"
-    default n
-    depends on LOSCFG_TEST_KERNEL_EXTEND && LOSCFG_TESTSUIT_SHELL
-config LOSCFG_TEST_KERNEL_EXTEND_DYNLOAD
-    bool "Enable DYNLOAD Testsuit"
-    default n
-    depends on LOSCFG_TEST_KERNEL_EXTEND && LOSCFG_TESTSUIT_SHELL
-config LOSCFG_TEST_KERNEL_EXTEND_MPU
-    bool "Enable MPU Testsuit"
-    default n
-    depends on LOSCFG_TEST_KERNEL_EXTEND && LOSCFG_TESTSUIT_SHELL
-
-config LOSCFG_TEST_KERNEL_EXTEND_TICKLESS
-    bool "Enable TICKLESS Testsuit"
-    default n
-    depends on LOSCFG_TEST_KERNEL_EXTEND && LOSCFG_TESTSUIT_SHELL
-
-config LOSCFG_TEST_KERNEL_EXTEND_TRACE
-    bool "Enable TRACE Testsuit"
-    default n
-    depends on LOSCFG_TEST_KERNEL_EXTEND && LOSCFG_TESTSUIT_SHELL
-
-config LOSCFG_TEST_POSIX
-    bool "Enable Posix Testsuit"
-    default n
-    depends on  LOSCFG_TESTSUIT_SHELL
-config LOSCFG_TEST_POSIX_MEM
-    bool "Enable Mem Testsuit"
-    default n
-    depends on LOSCFG_TEST_POSIX && LOSCFG_TESTSUIT_SHELL
-config LOSCFG_TEST_POSIX_MQUEUE
-    bool "Enable Mqueue Testsuit"
-    default n
-    depends on LOSCFG_TEST_POSIX && LOSCFG_TESTSUIT_SHELL
-config LOSCFG_TEST_POSIX_MUTEX
-    bool "Enable Mutex Testsuit"
-    default n
-    depends on LOSCFG_TEST_POSIX && LOSCFG_TESTSUIT_SHELL
-config LOSCFG_TEST_POSIX_PTHREAD
-    bool "Enable Pthread Testsuit"
-    default n
-    depends on LOSCFG_TEST_POSIX && LOSCFG_TESTSUIT_SHELL
-config LOSCFG_TEST_POSIX_SCHED
-    bool "Enable Sched Testsuit"
-    default n
-    depends on LOSCFG_TEST_POSIX && LOSCFG_TESTSUIT_SHELL
-config LOSCFG_TEST_POSIX_SEM
-    bool "Enable Sem Testsuit"
-    default n
-    depends on LOSCFG_TEST_POSIX && LOSCFG_TESTSUIT_SHELL
-config LOSCFG_TEST_POSIX_SWTMR
-    bool "Enable Swtmr Testsuit"
-    default n
-    depends on LOSCFG_TEST_POSIX && LOSCFG_TESTSUIT_SHELL
-config LOSCFG_TEST_LINUX
-    bool "Enable Linux Testsuit"
-    default n
-    depends on  LOSCFG_TESTSUIT_SHELL
-config LOSCFG_TEST_LINUX_HRTIMER
-    bool "Enable Hrtimer Testsuit"
-    default n
-    depends on LOSCFG_TEST_LINUX && LOSCFG_TESTSUIT_SHELL
-config LOSCFG_TEST_FS
-    bool "Enable FS Testsuit"
-    default n
-    depends on  LOSCFG_TESTSUIT_SHELL
-
-config LOSCFG_TEST_FS_VFS
-    bool "Enable VFS Test"
-    default n
-    depends on LOSCFG_TEST_FS && LOSCFG_TESTSUIT_SHELL
-config LOSCFG_TEST_FS_JFFS
-    bool "Enable JFFS Test"
-    default n
-    depends on LOSCFG_TEST_FS && LOSCFG_TESTSUIT_SHELL
-config LOSCFG_TEST_FS_RAMFS
-    bool "Enable RAMFS Test"
-    default n
-    depends on LOSCFG_TEST_FS && LOSCFG_TESTSUIT_SHELL
-
-config LOSCFG_TEST_FS_FAT
-    bool "Enable FAT Test"
-    default n
-    depends on LOSCFG_TEST_FS && !LOSCFG_FS_FAT_VIRTUAL_PARTITION && LOSCFG_TESTSUIT_SHELL
-config LOSCFG_TEST_FS_FAT_FAT32
-    bool "Enable FAT32 Test"
-    default n
-    depends on LOSCFG_TEST_FS_FAT && LOSCFG_TESTSUIT_SHELL
-config LOSCFG_TEST_FS_FAT_EXFAT
-    bool "Enable exFAT Test"
-    default n
-    depends on LOSCFG_TEST_FS_FAT && LOSCFG_TESTSUIT_SHELL
-config LOSCFG_TEST_FAT32_FSCK
-    bool "Enable FAT32 Fsck Test"
-    default n
-    depends on LOSCFG_TEST_FS_FAT && LOSCFG_TESTSUIT_SHELL
-
-config LOSCFG_TEST_FS_VIRPART
-    bool "Enable FAT virtual partition test"
-    default n
-    depends on LOSCFG_FS_FAT_VIRTUAL_PARTITION && LOSCFG_TEST_FS && LOSCFG_TESTSUIT_SHELL
-config LOSCFG_TEST_FS_PROC
-    bool "Enable PROC Test"
-    default n
-    depends on LOSCFG_TEST_FS && LOSCFG_TESTSUIT_SHELL
-config LOSCFG_TEST_FS_NFS
-    bool "Enable NFS Test"
-    default n
-    depends on LOSCFG_TEST_FS && LOSCFG_TESTSUIT_SHELL
-config LOSCFG_TEST_MTD
-    bool "Enable MTD Testsuit"
-    default n
-    depends on  LOSCFG_TESTSUIT_SHELL
-
-config LOSCFG_TEST_MTD_JFFS
-    bool "Enable JFFS MTD Testsuit"
-    default n
-    depends on LOSCFG_TEST_MTD && LOSCFG_TESTSUIT_SHELL
-
-config LOSCFG_TEST_MTD_FAT
-    bool "Enable FAT MTD Testsuit"
-    default n
-    depends on LOSCFG_TEST_MTD && !LOSCFG_FS_FAT_VIRTUAL_PARTITION && LOSCFG_TESTSUIT_SHELL
-
-config LOSCFG_TEST_MTD_FAT_VIRPART
-    bool "Enable FAT virtual partition MTD test"
-    default n
-    depends on LOSCFG_TEST_MTD && LOSCFG_FS_FAT_VIRTUAL_PARTITION && LOSCFG_TESTSUIT_SHELL
-
-config LOSCFG_TEST_DRIVERBASE
-    bool "Enable DriverBase Testsuit"
-    default n
-    depends on  LOSCFG_TESTSUIT_SHELL
-config LOSCFG_TEST_LIBC
-    bool "Enable LIBC Testsuit"
-    default n
-    depends on  LOSCFG_TESTSUIT_SHELL
-config LOSCFG_TEST_LIBM
-    bool "Enable LIBM Testsuit"
-    default n
-    depends on  LOSCFG_TESTSUIT_SHELL
-
-config LOSCFG_TEST_SHELL
-    bool "Enable Shell Testsuit"
-    default n
-    depends on  LOSCFG_TESTSUIT_SHELL
-config LOSCFG_TEST_USB
-    bool "Enable Usb Testsuit"
-    default n
-    depends on LOSCFG_TESTSUIT_SHELL && LOSCFG_DRIVERS_USB
-    help
-
-config LOSCFG_TEST_HOST_MASS_DEVICE
-    bool "Enable Host Mass Testsuit"
-    default n
-    depends on LOSCFG_TEST_USB && LOSCFG_DRIVERS_USB_MASS_STORAGE && LOSCFG_TESTSUIT_SHELL
-config LOSCFG_TEST_DEVICE_MASS_GADGET
-    bool "Enable Device Mass Testsuit"
-    default n
-    depends on LOSCFG_TEST_USB && LOSCFG_DRIVERS_USB_MASS_STORAGE_GADGET && LOSCFG_TESTSUIT_SHELL
-config LOSCFG_TEST_UVC_GADGET
-    bool "Enable UVC Gadget Testsuit"
-    default n
-    depends on LOSCFG_TEST_USB && LOSCFG_DRIVERS_USB_UVC_GADGET && LOSCFG_TESTSUIT_SHELL
-config LOSCFG_TEST_UAC_GADGET
-    bool "Enable UAC Gadget Testsuit"
-    default n
-    depends on LOSCFG_TEST_USB && LOSCFG_DRIVERS_USB_UAC_GADGET && LOSCFG_TESTSUIT_SHELL
-
-config LOSCFG_TEST_CAMERA_GADGET
-    bool "Enable Camera Gadget Testsuit"
-    default n
-    depends on LOSCFG_TEST_USB && LOSCFG_DRIVERS_USB_CAMERA_GADGET && LOSCFG_TESTSUIT_SHELL
-config LOSCFG_TEST_HUB_GADGET
-    bool "Enable HUB Gadget Testsuit"
-    default n
-    depends on LOSCFG_TEST_USB && LOSCFG_DRIVERS_USB_MASS_STORAGE && LOSCFG_TESTSUIT_SHELL
-config LOSCFG_TEST_SERIAL_GADGET
-    bool "Enable Serial Gadget Testsuit"
-    default n
-    depends on LOSCFG_TEST_USB && LOSCFG_DRIVERS_USB_SERIAL_GADGET && LOSCFG_TESTSUIT_SHELL
-config LOSCFG_TEST_ETHERNET_GADGET
-    bool "Enable Ethernet Gadget Testsuit"
-    default n
-    depends on LOSCFG_TEST_USB && LOSCFG_DRIVERS_USB_ETHERNET_GADGET && LOSCFG_TESTSUIT_SHELL
-config LOSCFG_TEST_MULTI_GADGET
-    bool "Enable Ethernet & Serial Gadget Testsuit"
-    default n
-    depends on LOSCFG_TEST_USB && LOSCFG_DRIVERS_USB_ETH_SER_GADGET && LOSCFG_TESTSUIT_SHELL
-config LOSCFG_TEST_DFU_GADGET
-    bool "Enable Drivers DFU Testsuit"
-    default n
-    depends on LOSCFG_TEST_USB && LOSCFG_TESTSUIT_SHELL
-config LOSCFG_TEST_MUTILDEVICE_GADGET
-    bool "Enable Drivers Multidevices Testsuit"
-    default n
-    depends on LOSCFG_TEST_USB && LOSCFG_TESTSUIT_SHELL
-config LOSCFG_TEST_HOST_ETH
-    bool "Enable Host Eth Testsuit"
-    default n
-    depends on LOSCFG_TEST_USB && LOSCFG_TESTSUIT_SHELL
-config LOSCFG_TEST_AUTO_USB
-    bool "Enable Usb auto Testsuit"
-    default n
-    depends on LOSCFG_TEST_USB && LOSCFG_TESTSUIT_SHELL
-
-config LOSCFG_TEST_MMC
-    bool "Enable MMC Testsuit"
-    default n
-    depends on LOSCFG_TESTSUIT_SHELL && LOSCFG_DRIVERS_MMC
-
-config LOSCFG_TEST_SD
-    bool "Enable SD Testsuit"
-    default n
-    depends on LOSCFG_TEST_MMC && LOSCFG_DRIVERS_MMC && LOSCFG_TESTSUIT_SHELL
-
-config LOSCFG_TEST_SDIO
-    bool "Enable SDIO Testsuit"
-    default n
-    depends on LOSCFG_TEST_MMC  && LOSCFG_DRIVERS_MMC && LOSCFG_TESTSUIT_SHELL
-
-comment "Only one platform can be selected"
-    depends on LOSCFG_TEST_SDIO && LOSCFG_TEST_MMC  && LOSCFG_DRIVERS_MMC && LOSCFG_TESTSUIT_SHELL
-config LOSCFG_TEST_SDIO_1131S
-    depends on LOSCFG_TEST_SDIO && LOSCFG_TEST_MMC  && LOSCFG_DRIVERS_MMC && LOSCFG_TESTSUIT_SHELL
-    bool "1131s"
-config LOSCFG_TEST_SDIO_RTL8189
-    depends on LOSCFG_TEST_SDIO && LOSCFG_TEST_MMC  && LOSCFG_DRIVERS_MMC && LOSCFG_TESTSUIT_SHELL
-    bool "RTL8189"
-
-config LOSCFG_TEST_PERFORMANCE
-    bool "Enable Performance Testsuit"
-    default n
-    depends on  LOSCFG_TESTSUIT_SHELL
-config LOSCFG_TEST_PERFORMANCE_CORE
-    bool "Enable Performance CORE Testsuit"
-    default n
-    depends on LOSCFG_TEST_PERFORMANCE && LOSCFG_TESTSUIT_SHELL
-config LOSCFG_TEST_PERFORMANCE_MEM
-    bool "Enable Performance MEM Testsuit"
-    default n
-    depends on LOSCFG_TEST_PERFORMANCE && LOSCFG_TESTSUIT_SHELL
-config LOSCFG_TEST_PERFORMANCE_FS
-    bool "Enable Performance FS Testsuit"
-    default n
-    depends on LOSCFG_TEST_PERFORMANCE && LOSCFG_TESTSUIT_SHELL
-config LOSCFG_TEST_PERFORMANCE_USB
-    bool "Enable Performance USB Testsuit"
-    default n
-    depends on LOSCFG_TEST_PERFORMANCE && LOSCFG_TESTSUIT_SHELL
-config LOSCFG_TEST_PERFORMANCE_NET
-    bool "Enable Performance NET Testsuit"
-    default n
-    depends on LOSCFG_TEST_PERFORMANCE && LOSCFG_TESTSUIT_SHELL
-
-config LOSCFG_TEST_PLATFORM
-    bool "Enable Platform Testsuit"
-    default n
-    depends on  LOSCFG_TESTSUIT_SHELL
-
-config LOSCFG_TEST_NET
-    bool "Enable NET Test"
-    default n
-    depends on  LOSCFG_TESTSUIT_SHELL
-    help
-    Attention: if this option turns on, other test suits will be ignored.
-
-config LOSCFG_TEST_LWIP
-    bool "Enable LWIP Testsuit"
-    default n
-    depends on LOSCFG_TEST_NET && LOSCFG_TESTSUIT_SHELL
-config AR6K3_WIFI_TEST
-    bool "Enable AR6K3_WIFI Test"
-    default n
-    depends on LOSCFG_TESTSUIT_SHELL && LOSCFG_DRIVERS_WIFI_QRD
-    help
-    Attention: if this option turns on, other test suits will be ignored.
-config BCM_WIFI_TEST
-    bool "Enable BCM_WIFI Test"
-    default n
-    depends on LOSCFG_TESTSUIT_SHELL && LOSCFG_DRIVERS_WIFI_BCM
-    help
-    Attention: if this option turns on, other test suits will be ignored.
-
-config LOSCFG_3RDPARTY_TEST
-    bool "Enable 3rdParty Test"
-    default n
-    depends on LOSCFG_TESTSUIT_SHELL && LOSCFG_3RDPARTY
-    help
-    Attention: 3rdParty tools and libs test
-config LOSCFG_TEST_MANUAL_SHELL
-    bool "Enable Manual Test"
-    default n
-    depends on LOSCFG_TESTSUIT_SHELL
-

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) \

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;
     };
 }
 

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;
     };
 }
 

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;
     }
 }
 

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:

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();

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;
     }
 }
 

testsuites/unittest/BUILD.gn

@@ -30,23 +30,17 @@
 import("config.gni")
 
 local_flags = []
-if (board_name == "hispark_taurus") {
-  local_flags += [ "-DLOSCFG_USER_TEST_SMP" ]
-}
-if (LOSCFG_USER_TEST_SMOKE == true) {
-  local_flags += [ "-DLOSCFG_USER_TEST_SMOKE" ]
-}
-if (LOSCFG_USER_TEST_FULL == true) {
-  local_flags += [ "-DLOSCFG_USER_TEST_FULL" ]
-}
-if (LOSCFG_USER_TEST_PRESSURE == true) {
-  local_flags += [ "-DLOSCFG_USER_TEST_PRESSURE" ]
-}
-if (LOSCFG_USER_TEST_LLT == true) {
-  local_flags += [ "-DLOSCFG_USER_TEST_LLT" ]
+local_flags_smoke = []
+local_flags_full = []
+if (LOSCFG_USER_TEST_SMP == "enable" || (LOSCFG_USER_TEST_SMP == "default" && board_name == "hispark_taurus")) {
+  local_flags = [ "-DLOSCFG_USER_TEST_SMP" ]
 }
+local_flags_smoke += [ "-DLOSCFG_USER_TEST_SMOKE" ]
+local_flags_full += [ "-DLOSCFG_USER_TEST_SMOKE" ]
+local_flags_full += [ "-DLOSCFG_USER_TEST_FULL" ]
+#local_flags_full += [ "-DLOSCFG_USER_TEST_PRESSURE" ]
 
-config("public_config") {
+config("local_public_config") {
   cflags = [ "-fpermissive" ]
   cflags += [
     "-O2",
@@ -57,99 +51,280 @@ config("public_config") {
   cflags_cc = cflags
 }
 
+config("public_config_smk") {
+  cflags = [ "-fpermissive" ]
+  cflags += [
+    "-O2",
+    "-fbuiltin",
+    "-Wno-narrowing",
+  ]
+  cflags += local_flags_smoke
+  cflags += local_flags
+  cflags_cc = cflags
+}
+
+config("public_config_full") {
+  cflags = [ "-fpermissive" ]
+  cflags += [
+    "-O2",
+    "-fbuiltin",
+    "-Wno-narrowing",
+  ]
+  cflags += local_flags_full
+  cflags += local_flags
+  cflags_cc = cflags
+}
+
 group("unittest") {
   deps = []
-  if (LOSCFG_USER_TEST_UTIL == true) {
-    deps += [ "util:liteos_a_util_unittest" ]
-  }
-  if (LOSCFG_USER_TEST_TIME_TIMER == true) {
-    deps += [ "time/timer:liteos_a_time_timer_unittest" ]
-  }
-  if (LOSCFG_USER_TEST_TIME_CLOCK == true) {
-    deps += [ "time/clock:liteos_a_time_clock_unittest" ]
-  }
-  if (LOSCFG_USER_TEST_SYS == true) {
-    deps += [ "sys:liteos_a_sys_unittest" ]
-  }
-  if (LOSCFG_USER_TEST_SIGNAL == true) {
-    deps += [ "signal:liteos_a_signal_unittest" ]
-  }
-  if (LOSCFG_USER_TEST_SECURITY_REUGID == true) {
-    deps += [ "security/reugid:liteos_a_security_reugid_unittest" ]
-  }
-  if (LOSCFG_USER_TEST_SECURITY_CAPABILITY == true) {
-    deps += [ "security/capability:liteos_a_security_capability_unittest" ]
-  }
-  if (LOSCFG_USER_TEST_SECURITY_VID == true) {
-    deps += [ "security/vid:liteos_a_security_vid_unittest" ]
-  }
-  if (LOSCFG_USER_TEST_MUTEX == true) {
-    deps += [ "process/mutex:liteos_a_mutex_unittest" ]
-  }
-  if (LOSCFG_USER_TEST_PROCESS == true) {
-    deps += [ "process/process:liteos_a_process_unittest" ]
-  }
-  if (LOSCFG_USER_TEST_PTHREAD == true) {
-    deps += [ "process/pthread:liteos_a_pthread_unittest" ]
-  }
-  if (LOSCFG_USER_TEST_RWLOCK == true) {
-    deps += [ "process/rwlock:liteos_a_rwlock_unittest" ]
-  }
-  if (LOSCFG_USER_TEST_SPINLOCK == true) {
-    deps += [ "process/spinlock:liteos_a_spinlock_unittest" ]
-  }
-  if (LOSCFG_USER_TEST_POSIX_MEM == true) {
-    deps += [ "posix/mem:liteos_a_posix_mem_unittest" ]
-  }
-  if (LOSCFG_USER_TEST_POSIX_MQUEUE == true) {
-    deps += [ "posix/mqueue:liteos_a_posix_mqueue_unittest" ]
-  }
-  if (LOSCFG_USER_TEST_POSIX_PTHREAD == true) {
-    deps += [ "posix/pthread:liteos_a_posix_pthread_unittest" ]
-  }
-  if (LOSCFG_USER_TEST_MISC == true) {
-    deps += [ "misc:liteos_a_misc_unittest" ]
-  }
-  if (LOSCFG_USER_TEST_MEM_SHM == true) {
-    deps += [ "mem/shm:liteos_a_mem_shm_unittest" ]
-  }
-  if (LOSCFG_USER_TEST_MEM_VM == true) {
-    deps += [ "mem/vm:liteos_a_mem_vm_unittest" ]
-  }
-  if (LOSCFG_USER_TEST_IO == true) {
-    deps += [ "IO:liteos_a_io_unittest" ]
-  }
-  if (LOSCFG_USER_TEST_EXC == true) {
-    deps += [ "exc:liteos_a_exc_unittest" ]
-  }
-  if (LOSCFG_USER_TEST_DYNLOAD == true) {
-    deps += [ "dynload:liteos_a_dynload_unittest" ]
-  }
-  if (LOSCFG_USER_TEST_DRIVERS_HID == true) {
-    deps += [ "drivers/hid:liteos_a_drivers_hid_unittest" ]
-  }
-  if (LOSCFG_USER_TEST_DRIVERS_STORAGE == true) {
-    deps += [ "drivers/storage:liteos_a_drivers_storage_unittest" ]
-  }
-  if (LOSCFG_USER_TEST_NET_NETDB == true) {
-    deps += [ "net/netdb:liteos_a_net_netdb_unittest" ]
-  }
-  if (LOSCFG_USER_TEST_NET_RESOLV == true) {
-    deps += [ "net/resolv:liteos_a_net_resolv_unittest" ]
-  }
-  if (LOSCFG_USER_TEST_NET_SOCKET == true) {
-    deps += [ "net/socket:liteos_a_net_socket_unittest" ]
-  }
-  if (LOSCFG_USER_TEST_IPC == true) {
-    deps += [ "IPC:liteos_a_ipc_unittest" ]
-  }
-  if (LOSCFG_USER_TEST_LITEIPC == true) {
-    deps += [ "liteipc:liteos_a_liteipc_unittest" ]
-  }
-  if (LOSCFG_USER_TEST_FS_JFFS == true) {
-    deps += [ "fs:liteos_a_fs_unittest" ]
-  }
-  if (LOSCFG_USER_TEST_FS_VFAT == true) {
-    deps += [ "fs/vfat2:liteos_a_fs_vfat_unittest" ]
+  if (ohos_build_type == "debug") {
+    if (LOSCFG_USER_TEST_MISC == true) {
+      if (LOSCFG_USER_TEST_FOR_ALL == true) {
+        deps += [ "misc:liteos_a_misc_unittest" ]
+      }
+      if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+        deps += [ "misc:liteos_a_misc_unittest_door" ]
+      }
+    }
+    if (LOSCFG_USER_TEST_DRIVERS_HID == true) {
+      if (LOSCFG_USER_TEST_FOR_ALL == true) {
+        deps += [ "drivers/hid:liteos_a_drivers_hid_unittest" ]
+      }
+      if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+        deps += [ "drivers/hid:liteos_a_drivers_hid_unittest_door" ]
+      }
+    }
+    if (LOSCFG_USER_TEST_DRIVERS_STORAGE == true) {
+      if (LOSCFG_USER_TEST_FOR_ALL == true) {
+        deps += [ "drivers/storage:liteos_a_drivers_storage_unittest" ]
+      }
+      if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+        deps += [ "drivers/storage:liteos_a_drivers_storage_unittest_door" ]
+      }
+    }
+    if (LOSCFG_USER_TEST_DYNLOAD == true) {
+      if (LOSCFG_USER_TEST_FOR_ALL == true) {
+        deps += [ "dynload:liteos_a_dynload_unittest" ]
+      }
+      if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+        deps += [ "dynload:liteos_a_dynload_unittest_door" ]
+      }
+    }
+    if (LOSCFG_USER_TEST_EXC == true) {
+      if (LOSCFG_USER_TEST_FOR_ALL == true) {
+        deps += [ "exc:liteos_a_exc_unittest" ]
+      }
+      if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+        deps += [ "exc:liteos_a_exc_unittest_door" ]
+      }
+    }
+    if (LOSCFG_USER_TEST_FS_JFFS == true) {
+      if (LOSCFG_USER_TEST_FOR_ALL == true) {
+        deps += [ "fs:liteos_a_fs_unittest" ]
+      }
+      if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+        deps += [ "fs:liteos_a_fs_unittest_door" ]
+      }
+    }
+    if (LOSCFG_USER_TEST_FS_VFAT == true) {
+      if (LOSCFG_USER_TEST_FOR_ALL == true) {
+        deps += [ "fs/vfat2:liteos_a_fs_vfat_unittest" ]
+      }
+      if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+        deps += [ "fs/vfat2:liteos_a_fs_vfat_unittest_door" ]
+      }
+    }
+    if (LOSCFG_USER_TEST_IO == true) {
+      if (LOSCFG_USER_TEST_FOR_ALL == true) {
+        deps += [ "IO:liteos_a_io_unittest" ]
+      }
+      if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+        deps += [ "IO:liteos_a_io_unittest_door" ]
+      }
+    }
+    if (LOSCFG_USER_TEST_IPC == true) {
+      if (LOSCFG_USER_TEST_FOR_ALL == true) {
+        deps += [ "IPC:liteos_a_ipc_unittest" ]
+      }
+      if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+        deps += [ "IPC:liteos_a_ipc_unittest_door" ]
+      }
+    }
+    if (LOSCFG_USER_TEST_LITEIPC == true) {
+      if (LOSCFG_USER_TEST_FOR_ALL == true) {
+        deps += [ "liteipc:liteos_a_liteipc_unittest" ]
+      }
+      if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+        deps += [ "liteipc:liteos_a_liteipc_unittest_door" ]
+      }
+    }
+    if (LOSCFG_USER_TEST_MEM_SHM == true) {
+      if (LOSCFG_USER_TEST_FOR_ALL == true) {
+        deps += [ "mem/shm:liteos_a_mem_shm_unittest" ]
+      }
+      if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+        deps += [ "mem/shm:liteos_a_mem_shm_unittest_door" ]
+      }
+    }
+    if (LOSCFG_USER_TEST_MEM_VM == true) {
+      if (LOSCFG_USER_TEST_FOR_ALL == true) {
+        deps += [ "mem/vm:liteos_a_mem_vm_unittest" ]
+      }
+      if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+        deps += [ "mem/vm:liteos_a_mem_vm_unittest_door" ]
+      }
+    }
+    if (LOSCFG_USER_TEST_NET_NETDB == true) {
+      if (LOSCFG_USER_TEST_FOR_ALL == true) {
+        deps += [ "net/netdb:liteos_a_net_netdb_unittest" ]
+      }
+      if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+        deps += [ "net/netdb:liteos_a_net_netdb_unittest_door" ]
+      }
+    }
+    if (LOSCFG_USER_TEST_NET_RESOLV == true) {
+      if (LOSCFG_USER_TEST_FOR_ALL == true) {
+        deps += [ "net/resolv:liteos_a_net_resolv_unittest" ]
+      }
+      if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+        deps += [ "net/resolv:liteos_a_net_resolv_unittest_door" ]
+      }
+    }
+    if (LOSCFG_USER_TEST_NET_SOCKET == true) {
+      if (LOSCFG_USER_TEST_FOR_ALL == true) {
+        deps += [ "net/socket:liteos_a_net_socket_unittest" ]
+      }
+      if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+        deps += [ "net/socket:liteos_a_net_socket_unittest_door" ]
+      }
+    }
+    if (LOSCFG_USER_TEST_POSIX_MEM == true) {
+      if (LOSCFG_USER_TEST_FOR_ALL == true) {
+        deps += [ "posix/mem:liteos_a_posix_mem_unittest" ]
+      }
+      if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+        deps += [ "posix/mem:liteos_a_posix_mem_unittest_door" ]
+      }
+    }
+    if (LOSCFG_USER_TEST_POSIX_MQUEUE == true) {
+      if (LOSCFG_USER_TEST_FOR_ALL == true) {
+        deps += [ "posix/mqueue:liteos_a_posix_mqueue_unittest" ]
+      }
+      if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+        deps += [ "posix/mqueue:liteos_a_posix_mqueue_unittest_door" ]
+      }
+    }
+    if (LOSCFG_USER_TEST_POSIX_PTHREAD == true) {
+      if (LOSCFG_USER_TEST_FOR_ALL == true) {
+        deps += [ "posix/pthread:liteos_a_posix_pthread_unittest" ]
+      }
+      if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+        deps += [ "posix/pthread:liteos_a_posix_pthread_unittest_door" ]
+      }
+    }
+    if (LOSCFG_USER_TEST_MUTEX == true) {
+      if (LOSCFG_USER_TEST_FOR_ALL == true) {
+        deps += [ "process/mutex:liteos_a_mutex_unittest" ]
+      }
+      if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+        deps += [ "process/mutex:liteos_a_mutex_unittest_door" ]
+      }
+    }
+    if (LOSCFG_USER_TEST_PROCESS == true) {
+      if (LOSCFG_USER_TEST_FOR_ALL == true) {
+        deps += [ "process/process:liteos_a_process_unittest" ]
+      }
+      if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+        deps += [ "process/process:liteos_a_process_unittest_door" ]
+      }
+    }
+    if (LOSCFG_USER_TEST_PTHREAD == true) {
+      if (LOSCFG_USER_TEST_FOR_ALL == true) {
+        deps += [ "process/pthread:liteos_a_pthread_unittest" ]
+      }
+      if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+        deps += [ "process/pthread:liteos_a_pthread_unittest_door" ]
+      }
+    }
+    if (LOSCFG_USER_TEST_RWLOCK == true) {
+      if (LOSCFG_USER_TEST_FOR_ALL == true) {
+        deps += [ "process/rwlock:liteos_a_rwlock_unittest" ]
+      }
+      if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+        deps += [ "process/rwlock:liteos_a_rwlock_unittest_door" ]
+      }
+    }
+    if (LOSCFG_USER_TEST_SPINLOCK == true) {
+      if (LOSCFG_USER_TEST_FOR_ALL == true) {
+        deps += [ "process/spinlock:liteos_a_spinlock_unittest" ]
+      }
+      if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+        deps += [ "process/spinlock:liteos_a_spinlock_unittest_door" ]
+      }
+    }
+    if (LOSCFG_USER_TEST_SECURITY_REUGID == true) {
+      if (LOSCFG_USER_TEST_FOR_ALL == true) {
+        deps += [ "security/reugid:liteos_a_security_reugid_unittest" ]
+      }
+      if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+        deps += [ "security/reugid:liteos_a_security_reugid_unittest_door" ]
+      }
+    }
+    if (LOSCFG_USER_TEST_SECURITY_CAPABILITY == true) {
+      if (LOSCFG_USER_TEST_FOR_ALL == true) {
+        deps += [ "security/capability:liteos_a_security_capability_unittest" ]
+      }
+      if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+        deps += [ "security/capability:liteos_a_security_capability_unittest_door" ]
+      }
+    }
+    if (LOSCFG_USER_TEST_SECURITY_VID == true) {
+      if (LOSCFG_USER_TEST_FOR_ALL == true) {
+        deps += [ "security/vid:liteos_a_security_vid_unittest" ]
+      }
+      if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+        deps += [ "security/vid:liteos_a_security_vid_unittest_door" ]
+      }
+    }
+    if (LOSCFG_USER_TEST_UTIL == true) {
+      if (LOSCFG_USER_TEST_FOR_ALL == true) {
+        deps += [ "util:liteos_a_util_unittest" ]
+      }
+      if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+        deps += [ "util:liteos_a_util_unittest_door" ]
+      }
+    }
+    if (LOSCFG_USER_TEST_TIME_TIMER == true) {
+      if (LOSCFG_USER_TEST_FOR_ALL == true) {
+        deps += [ "time/timer:liteos_a_time_timer_unittest" ]
+      }
+      if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+        deps += [ "time/timer:liteos_a_time_timer_unittest_door" ]
+      }
+    }
+    if (LOSCFG_USER_TEST_TIME_CLOCK == true) {
+      if (LOSCFG_USER_TEST_FOR_ALL == true) {
+        deps += [ "time/clock:liteos_a_time_clock_unittest" ]
+      }
+      if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+        deps += [ "time/clock:liteos_a_time_clock_unittest_door" ]
+      }
+    }
+    if (LOSCFG_USER_TEST_SYS == true) {
+      if (LOSCFG_USER_TEST_FOR_ALL == true) {
+        deps += [ "sys:liteos_a_sys_unittest" ]
+      }
+      if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+        deps += [ "sys:liteos_a_sys_unittest_door" ]
+      }
+    }
+    if (LOSCFG_USER_TEST_SIGNAL == true) {
+      if (LOSCFG_USER_TEST_FOR_ALL == true) {
+        deps += [ "signal:liteos_a_signal_unittest" ]
+      }
+      if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+        deps += [ "signal:liteos_a_signal_unittest_door" ]
+      }
+    }
   }
 }

testsuites/unittest/IO/BUILD.gn

@@ -28,20 +28,33 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//build/lite/config/test.gni")
+import("../config.gni")
 
-unittest("liteos_a_io_unittest") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
-    "../common/include",
-    "../IO",
-  ]
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
+  "../common/include",
+  "../IO",
+]
+
+sources_entry = [
+  "../common/osTest.cpp",
+  "io_test.cpp",
+]
+
+source_set("sources_smoke") {
+  sources = [
+    "smoke/IO_test_005.cpp",
+    "smoke/IO_test_008.cpp",
+    "smoke/IO_test_010.cpp",
+    "smoke/IO_test_013.cpp",
+  ]
+  configs += [ "..:local_public_config" ]
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
+
+source_set("sources_other") {
   sources = [
-    "../common/osTest.cpp",
-    "full/IO_test_005.cpp",
-    "full/IO_test_008.cpp",
-    "full/IO_test_010.cpp",
-    "full/IO_test_013.cpp",
     "full/IO_test_confstr_001.cpp",
     "full/IO_test_dcgettext_001.cpp",
     "full/IO_test_dcgettext_002.cpp",
@@ -74,13 +87,35 @@ unittest("liteos_a_io_unittest") {
     "full/It_stdlib_poll_002.cpp",
     "full/It_stdlib_poll_003.cpp",
     "full/IO_test_gettext_001.cpp",
-    #"full/IO_test_ppoll_001.cpp",
-    #"full/IO_test_ppoll_002.cpp",
-    #"full/IO_test_pselect_001.cpp",
     "full/IO_test_strncasecmp_l_001.cpp",
     "full/IO_test_strncasecmp_l_002.cpp",
-    "io_test.cpp",
   ]
+  configs += [ "..:local_public_config" ]
+  include_dirs = common_include_dirs
   deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
-  configs = [ "..:public_config" ]
 }
+
+if (LOSCFG_USER_TEST_FOR_ALL == true) {
+  unittest("liteos_a_io_unittest") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "..:public_config_full" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+    deps += [ ":sources_other" ]
+  }
+}
+
+if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+  unittest("liteos_a_io_unittest_door") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "..:public_config_smk" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+  }
+}

testsuites/unittest/IO/io_test.cpp

@@ -43,6 +43,7 @@ public:
     static void TearDownTestCase(void) {}
 };
 
+#if defined(LOSCFG_USER_TEST_SMOKE)
 /* *
  * @tc.name: IT_TEST_IO_005
  * @tc.desc: function for IoTest
@@ -89,7 +90,9 @@ HWTEST_F(IoTest, ItTestIo013, TestSize.Level0)
 {
     ItTestIo013();
 }
+#endif
 
+#if defined(LOSCFG_USER_TEST_FULL)
 /* *
  * @tc.name: IT_STDLIB_POLL_002
  * @tc.desc: function for IoTest
@@ -233,5 +236,5 @@ HWTEST_F(IoTest, ItStdioMbrlen001, TestSize.Level0)
 {
     ItStdioMbrlen001();
 }
-
+#endif
 } // namespace OHOS

testsuites/unittest/IPC/BUILD.gn

@@ -28,20 +28,58 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//build/lite/config/test.gni")
+import("../config.gni")
 
-unittest("liteos_a_ipc_unittest") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
-    "../common/include",
-    "../IPC",
-  ]
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
+  "../common/include",
+  "../IPC",
+]
+
+sources_entry = [
+  "../common/osTest.cpp",
+  "ipc_test.cpp",
+]
+
+source_set("sources_smoke") {
+  sources = [
+  ]
+  configs += [ "..:local_public_config" ]
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
+
+source_set("sources_other") {
   sources = [
-    "../common/osTest.cpp",
     "full/IPC_test_mkfifoat_001.cpp",
     "full/IPC_test_mkfifoat_002.cpp",
-    "ipc_test.cpp",
   ]
+  configs += [ "..:local_public_config" ]
+  include_dirs = common_include_dirs
   deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
-  configs = [ "..:public_config" ]
+}
+
+if (LOSCFG_USER_TEST_FOR_ALL == true) {
+  unittest("liteos_a_ipc_unittest") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "..:public_config_full" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+    deps += [ ":sources_other" ]
+  }
+}
+
+if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+  unittest("liteos_a_ipc_unittest_door") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "..:public_config_smk" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+  }
 }

testsuites/unittest/IPC/ipc_test.cpp

@@ -41,6 +41,7 @@ public:
     static void TearDownTestCase(void) {}
 };
 
+#if defined(LOSCFG_USER_TEST_FULL)
 /* *
  * @tc.name: IPC_TEST_MKFIFOAT_001
  * @tc.desc: function for IoTest:mkfifoat-normal test
@@ -66,4 +67,5 @@ HWTEST_F(IoTest, IPC_TEST_MKFIFOAT_002, TestSize.Level0)
     IPC_TEST_MKFIFOAT_002();
 }
 #endif
+#endif
 } // namespace OHOS

testsuites/unittest/common/include/osTest.h

@@ -68,9 +68,6 @@
 #define OK 0
 #endif
 
-#define LOSCFG_USER_TEST_SMOKE 1
-#define LOSCFG_USER_TEST_FULL 1
-
 #define dprintf printf
 #define ENOERR OK
 #define LOSCFG_BASE_CORE_TSK_CONFIG 1024

testsuites/unittest/config.gni

@@ -27,19 +27,30 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-LOSCFG_USER_TEST_LLT = false
-LOSCFG_USER_TEST_SMOKE = true
+LOSCFG_USER_TEST_FOR_DOOR = true
+LOSCFG_USER_TEST_FOR_ALL = false
 LOSCFG_USER_TEST_PRESSURE = false
-LOSCFG_USER_TEST_FULL = true
 
-LOSCFG_USER_TEST_DRIVERS_STORAGE = true
+# "default": depend on board_name
+# "enable": those testsuites testing for SMP is enable
+# "disable" those testsuites is disable
+LOSCFG_USER_TEST_SMP = "default"
+
+LOSCFG_USER_TEST_MISC = true
 LOSCFG_USER_TEST_DRIVERS_HID = true
+LOSCFG_USER_TEST_DRIVERS_STORAGE = true
 LOSCFG_USER_TEST_DYNLOAD = true
 LOSCFG_USER_TEST_EXC = true
+LOSCFG_USER_TEST_FS_JFFS = false
+LOSCFG_USER_TEST_FS_VFAT = false
 LOSCFG_USER_TEST_IO = true
+LOSCFG_USER_TEST_IPC = false
+LOSCFG_USER_TEST_LITEIPC = false
 LOSCFG_USER_TEST_MEM_VM = true
 LOSCFG_USER_TEST_MEM_SHM = true
-LOSCFG_USER_TEST_MISC = true
+LOSCFG_USER_TEST_NET_NETDB = true
+LOSCFG_USER_TEST_NET_RESOLV = true
+LOSCFG_USER_TEST_NET_SOCKET = true
 LOSCFG_USER_TEST_POSIX_PTHREAD = false
 LOSCFG_USER_TEST_POSIX_MQUEUE = true
 LOSCFG_USER_TEST_POSIX_MEM = true
@@ -55,11 +66,4 @@ LOSCFG_USER_TEST_SIGNAL = true
 LOSCFG_USER_TEST_SYS = true
 LOSCFG_USER_TEST_TIME_CLOCK = true 
 LOSCFG_USER_TEST_TIME_TIMER = true
-LOSCFG_USER_TEST_UTIL = true
-LOSCFG_USER_TEST_NET_NETDB = true
-LOSCFG_USER_TEST_NET_RESOLV = true
-LOSCFG_USER_TEST_NET_SOCKET = true
-LOSCFG_USER_TEST_IPC = false
-LOSCFG_USER_TEST_LITEIPC = false
-LOSCFG_USER_TEST_FS_JFFS = true
-LOSCFG_USER_TEST_FS_VFAT = true
+LOSCFG_USER_TEST_UTIL = true

testsuites/unittest/drivers/hid/BUILD.gn

@@ -28,19 +28,57 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//build/lite/config/test.gni")
+import("../../config.gni")
 
-unittest("liteos_a_drivers_hid_unittest") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
-    "../../common/include",
-    "../../drivers/hid",
-  ]
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
+  "../../common/include",
+  "../../drivers/hid",
+]
+
+sources_entry = [
+  "../../common/osTest.cpp",
+  "drivers_hid_test.cpp",
+]
+
+source_set("sources_smoke") {
   sources = [
-    "../../common/osTest.cpp",
-    "drivers_hid_test.cpp",
     "smoke/hid_test_001.cpp",
   ]
+  configs += [ "../..:local_public_config" ]
+  include_dirs = common_include_dirs
   deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
-  configs = [ "../..:public_config" ]
 }
+
+source_set("sources_other") {
+  sources = [
+  ]
+  configs += [ "../..:local_public_config" ]
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
+
+if (LOSCFG_USER_TEST_FOR_ALL == true) {
+  unittest("liteos_a_drivers_hid_unittest") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "../..:public_config_full" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+    deps += [ ":sources_other" ]
+  }
+}
+
+if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+  unittest("liteos_a_drivers_hid_unittest_door") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "../..:public_config_smk" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+  }
+}

testsuites/unittest/drivers/hid/drivers_hid_test.cpp

@@ -40,6 +40,7 @@ public:
     static void TearDownTestCase(void) {}
 };
 
+#if defined(LOSCFG_USER_TEST_SMOKE)
 /* *
  * @tc.name: it_test_hid_001
  * @tc.desc: function for drivers hid
@@ -50,4 +51,5 @@ HWTEST_F(DriversHidTest, ItTestHid001, TestSize.Level0)
 {
     ItTestHid001();
 }
+#endif
 } // namespace OHOS

testsuites/unittest/drivers/storage/BUILD.gn

@@ -28,18 +28,57 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//build/lite/config/test.gni")
+import("../../config.gni")
 
-unittest("liteos_a_drivers_storage_unittest") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
-    "../../common/include",
-    "../../drivers/storage",
-  ]
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
+  "../../common/include",
+  "../../drivers/storage",
+]
+
+sources_entry = [
+  "../../common/osTest.cpp",
+  "drivers_storage_test.cpp",
+]
+
+source_set("sources_smoke") {
   sources = [
-    "../../common/osTest.cpp",
-    "drivers_storage_test.cpp",
     "smoke/storage_test_001.cpp",
   ]
+  configs += [ "../..:local_public_config" ]
+  include_dirs = common_include_dirs
   deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
 }
+
+source_set("sources_other") {
+  sources = [
+  ]
+  configs += [ "../..:local_public_config" ]
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
+
+if (LOSCFG_USER_TEST_FOR_ALL == true) {
+  unittest("liteos_a_drivers_storage_unittest") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "../..:public_config_full" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+    deps += [ ":sources_other" ]
+  }
+}
+
+if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+  unittest("liteos_a_drivers_storage_unittest_door") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "../..:public_config_smk" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+  }
+}

testsuites/unittest/drivers/storage/drivers_storage_test.cpp

@@ -40,6 +40,7 @@ public:
     static void TearDownTestCase(void) {}
 };
 
+#if defined(LOSCFG_USER_TEST_SMOKE)
 /* *
  * @tc.name: it_test_storage_001
  * @tc.desc: function for drivers storage
@@ -50,4 +51,5 @@ HWTEST_F(DriversStorageTest, ItTestStorage001, TestSize.Level0)
 {
     ItTestStorage001();
 }
+#endif
 } // namespace OHOS

testsuites/unittest/dynload/BUILD.gn

@@ -28,20 +28,58 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//build/lite/config/test.gni")
+import("../config.gni")
 
-unittest("liteos_a_dynload_unittest") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
-    "../common/include",
-    "../dynload",
-  ]
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
+  "../common/include",
+  "../dynload",
+]
+
+sources_entry = [
+  "../common/osTest.cpp",
+  "dynload_test.cpp",
+]
+
+source_set("sources_smoke") {
   sources = [
-    "../common/osTest.cpp",
-    "dynload_test.cpp",
     "smoke/dynload_test_002.cpp",
     "smoke/dynload_test_004.cpp",
   ]
+  configs += [ "..:local_public_config" ]
+  include_dirs = common_include_dirs
   deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
-  configs = [ "..:public_config" ]
 }
+
+source_set("sources_other") {
+  sources = [
+  ]
+  configs += [ "..:local_public_config" ]
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
+
+if (LOSCFG_USER_TEST_FOR_ALL == true) {
+  unittest("liteos_a_dynload_unittest") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "..:public_config_full" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+    deps += [ ":sources_other" ]
+  }
+}
+
+if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+  unittest("liteos_a_dynload_unittest_door") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "..:public_config_smk" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+  }
+}

testsuites/unittest/dynload/dynload_test.cpp

@@ -41,6 +41,7 @@ public:
     static void TearDownTestCase(void) {}
 };
 
+#if defined(LOSCFG_USER_TEST_SMOKE)
 /* *
  * @tc.name: it_test_dynload_002
  * @tc.desc: function for DynloadTest
@@ -62,4 +63,5 @@ HWTEST_F(DynloadTest, ItTestDynload004, TestSize.Level0)
 {
     ItTestDynload004();
 }
+#endif
 } // namespace OHOS

testsuites/unittest/exc/BUILD.gn

@@ -28,24 +28,62 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//build/lite/config/test.gni")
+import("../config.gni")
 
-unittest("liteos_a_exc_unittest") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
-    "../common/include",
-    "../exc",
-  ]
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
+  "../common/include",
+  "../exc",
+]
+
+sources_entry = [
+  "../common/osTest.cpp",
+  "exc_test.cpp",
+]
+
+source_set("sources_smoke") {
+  sources = [
+    "smoke/it_test_exc_001.cpp",
+    "smoke/it_test_exc_002.cpp",
+    "smoke/it_test_exc_003.cpp",
+    "smoke/it_test_exc_004.cpp",
+    "smoke/it_test_exc_005.cpp",
+  ]
+  configs += [ "..:local_public_config" ]
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
+
+source_set("sources_other") {
   sources = [
-    "../common/osTest.cpp",
-    "exc_test.cpp",
-    "full/it_test_exc_001.cpp",
-    "full/it_test_exc_002.cpp",
-    "full/it_test_exc_003.cpp",
-    "full/it_test_exc_004.cpp",
-    "full/it_test_exc_005.cpp",
     "full/it_test_fexecve_001.cpp",
   ]
+  configs += [ "..:local_public_config" ]
+  include_dirs = common_include_dirs
   deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
-  configs = [ "..:public_config" ]
 }
+
+if (LOSCFG_USER_TEST_FOR_ALL == true) {
+  unittest("liteos_a_exc_unittest") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "..:public_config_full" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+    deps += [ ":sources_other" ]
+  }
+}
+
+if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+  unittest("liteos_a_exc_unittest_door") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "..:public_config_smk" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+  }
+}

testsuites/unittest/exc/exc_test.cpp

@@ -41,6 +41,7 @@ public:
     static void TearDownTestCase(void) {}
 };
 
+#if defined(LOSCFG_USER_TEST_SMOKE)
 /* *
  * @tc.name: ItTestExc005
  * @tc.desc: function for ExcTest
@@ -95,5 +96,5 @@ HWTEST_F(ExcTest, ItTestExc004, TestSize.Level0)
 {
     ItTestExc004();
 }
-
+#endif
 } // namespace OHOS

testsuites/unittest/fs/BUILD.gn

@@ -28,18 +28,197 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//build/lite/config/test.gni")
+import("../config.gni")
 
-unittest("liteos_a_fs_unittest") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
-    "//kernel/liteos_a/testsuites/unittest/common/include",
-    "//kernel/liteos_a/testsuites/unittest/fs/vfs",
-    "//kernel/liteos_a/testsuites/unittest/fs/jffs",
-  ]
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
+  "//kernel/liteos_a/testsuites/unittest/fs/vfs",
+  "//kernel/liteos_a/testsuites/unittest/fs/jffs",
+  "../common/include",
+]
+
+sources_entry = [
+  "../common/osTest.cpp",
+  "jffs/vfs_jffs_test.cpp",
+]
+
+source_set("sources_smoke") {
+  sources = [
+    "jffs/smoke/It_vfs_jffs_001.cpp",
+    "jffs/smoke/It_vfs_jffs_002.cpp",
+    "jffs/smoke/It_vfs_jffs_003.cpp",
+    "jffs/smoke/It_vfs_jffs_005.cpp",
+    "jffs/smoke/It_vfs_jffs_021.cpp",
+    "jffs/smoke/It_vfs_jffs_022.cpp",
+    "jffs/smoke/It_vfs_jffs_026.cpp",
+    "jffs/smoke/It_vfs_jffs_027.cpp",
+    "jffs/smoke/It_vfs_jffs_034.cpp",
+    "jffs/smoke/It_vfs_jffs_035.cpp",
+    "jffs/smoke/It_vfs_jffs_094.cpp",
+    "jffs/smoke/It_vfs_jffs_095.cpp",
+    #"jffs/smoke/It_vfs_jffs_103.cpp",
+    "jffs/smoke/It_vfs_jffs_535.cpp",
+    "jffs/smoke/It_vfs_jffs_Dac_001.cpp",
+  ]
+  configs += [ "..:local_public_config" ]
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
+
+if (LOSCFG_USER_TEST_PRESSURE == true) {
+  source_set("sources_pressure") {
+    sources = [
+      "jffs/pressure/It_fs_jffs_performance_001.cpp",
+      "jffs/pressure/It_fs_jffs_performance_002.cpp",
+      "jffs/pressure/It_fs_jffs_performance_003.cpp",
+      "jffs/pressure/It_fs_jffs_performance_004.cpp",
+      "jffs/pressure/It_fs_jffs_performance_005.cpp",
+      "jffs/pressure/It_fs_jffs_performance_006.cpp",
+      "jffs/pressure/It_fs_jffs_performance_007.cpp",
+      "jffs/pressure/It_fs_jffs_performance_008.cpp",
+      "jffs/pressure/It_fs_jffs_performance_009.cpp",
+      "jffs/pressure/It_fs_jffs_performance_010.cpp",
+      "jffs/pressure/It_fs_jffs_performance_011.cpp",
+      "jffs/pressure/It_fs_jffs_performance_012.cpp",
+      "jffs/pressure/It_fs_jffs_performance_013.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_001.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_002.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_003.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_004.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_005.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_006.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_007.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_008.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_009.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_010.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_011.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_012.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_014.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_015.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_016.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_017.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_018.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_019.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_020.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_021.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_022.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_023.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_024.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_025.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_026.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_027.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_028.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_029.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_030.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_031.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_032.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_033.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_034.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_035.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_036.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_037.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_038.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_039.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_040.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_041.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_042.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_043.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_044.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_045.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_046.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_047.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_048.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_049.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_050.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_051.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_052.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_053.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_301.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_302.cpp",
+      #"jffs/pressure/It_fs_jffs_pressure_303.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_304.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_305.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_306.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_307.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_308.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_309.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_310.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_311.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_312.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_313.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_314.cpp",
+      "jffs/pressure/It_fs_jffs_pressure_315.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_001.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_002.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_003.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_004.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_005.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_006.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_007.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_008.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_009.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_010.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_011.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_012.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_013.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_014.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_015.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_016.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_017.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_018.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_019.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_020.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_021.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_022.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_023.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_024.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_025.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_026.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_027.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_028.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_029.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_030.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_031.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_032.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_033.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_034.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_035.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_036.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_037.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_038.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_039.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_040.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_041.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_042.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_043.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_044.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_045.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_046.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_047.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_048.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_049.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_050.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_051.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_052.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_053.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_054.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_055.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_056.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_057.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_058.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_059.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_060.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_061.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_062.cpp",
+      "jffs/pressure/It_vfs_jffs_multipthread_063.cpp",
+    ]
+    include_dirs = common_include_dirs
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+  }
+}
+
+source_set("sources_other") {
   sources = [
-    "//kernel/liteos_a/testsuites/unittest/common/osTest.cpp",
-    "jffs/vfs_jffs_test.cpp",
     "jffs/full/It_jffs_001.cpp",
     "jffs/full/It_jffs_002.cpp",
     "jffs/full/It_jffs_003.cpp",
@@ -612,169 +791,36 @@ unittest("liteos_a_fs_unittest") {
     "jffs/full/It_vfs_jffs_701.cpp",
     "jffs/full/It_vfs_jffs_807.cpp",
     "jffs/full/It_vfs_jffs_808.cpp",
-
-
-    "jffs/smoke/It_vfs_jffs_001.cpp",
-    "jffs/smoke/It_vfs_jffs_002.cpp",
-    "jffs/smoke/It_vfs_jffs_003.cpp",
-    "jffs/smoke/It_vfs_jffs_005.cpp",
-    "jffs/smoke/It_vfs_jffs_021.cpp",
-    "jffs/smoke/It_vfs_jffs_022.cpp",
-    "jffs/smoke/It_vfs_jffs_026.cpp",
-    "jffs/smoke/It_vfs_jffs_027.cpp",
-    "jffs/smoke/It_vfs_jffs_034.cpp",
-    "jffs/smoke/It_vfs_jffs_035.cpp",
-    "jffs/smoke/It_vfs_jffs_094.cpp",
-    "jffs/smoke/It_vfs_jffs_095.cpp",
-    #"jffs/smoke/It_vfs_jffs_103.cpp",
-    "jffs/smoke/It_vfs_jffs_535.cpp",
-    "jffs/smoke/It_vfs_jffs_Dac_001.cpp",
-
-
-    "jffs/pressure/It_fs_jffs_performance_001.cpp",
-    "jffs/pressure/It_fs_jffs_performance_002.cpp",
-    "jffs/pressure/It_fs_jffs_performance_003.cpp",
-    "jffs/pressure/It_fs_jffs_performance_004.cpp",
-    "jffs/pressure/It_fs_jffs_performance_005.cpp",
-    "jffs/pressure/It_fs_jffs_performance_006.cpp",
-    "jffs/pressure/It_fs_jffs_performance_007.cpp",
-    "jffs/pressure/It_fs_jffs_performance_008.cpp",
-    "jffs/pressure/It_fs_jffs_performance_009.cpp",
-    "jffs/pressure/It_fs_jffs_performance_010.cpp",
-    "jffs/pressure/It_fs_jffs_performance_011.cpp",
-    "jffs/pressure/It_fs_jffs_performance_012.cpp",
-    "jffs/pressure/It_fs_jffs_performance_013.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_001.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_002.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_003.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_004.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_005.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_006.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_007.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_008.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_009.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_010.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_011.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_012.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_014.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_015.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_016.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_017.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_018.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_019.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_020.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_021.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_022.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_023.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_024.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_025.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_026.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_027.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_028.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_029.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_030.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_031.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_032.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_033.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_034.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_035.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_036.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_037.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_038.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_039.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_040.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_041.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_042.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_043.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_044.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_045.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_046.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_047.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_048.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_049.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_050.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_051.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_052.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_053.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_301.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_302.cpp",
-    #"jffs/pressure/It_fs_jffs_pressure_303.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_304.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_305.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_306.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_307.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_308.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_309.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_310.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_311.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_312.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_313.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_314.cpp",
-    "jffs/pressure/It_fs_jffs_pressure_315.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_001.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_002.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_003.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_004.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_005.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_006.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_007.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_008.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_009.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_010.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_011.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_012.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_013.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_014.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_015.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_016.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_017.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_018.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_019.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_020.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_021.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_022.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_023.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_024.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_025.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_026.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_027.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_028.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_029.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_030.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_031.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_032.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_033.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_034.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_035.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_036.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_037.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_038.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_039.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_040.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_041.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_042.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_043.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_044.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_045.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_046.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_047.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_048.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_049.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_050.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_051.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_052.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_053.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_054.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_055.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_056.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_057.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_058.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_059.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_060.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_061.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_062.cpp",
-    "jffs/pressure/It_vfs_jffs_multipthread_063.cpp",
   ]
+  configs += [ "..:local_public_config" ]
+  include_dirs = common_include_dirs
   deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
-  configs = [ "//kernel/liteos_a/testsuites/unittest:public_config" ]
 }
+
+if (LOSCFG_USER_TEST_FOR_ALL == true) {
+  unittest("liteos_a_fs_unittest") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "..:public_config_full" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+    if (LOSCFG_USER_TEST_PRESSURE == true) {
+      deps += [ ":sources_pressure" ]
+    }
+    deps += [ ":sources_other" ]
+  }
+}
+
+if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+  unittest("liteos_a_fs_unittest_door") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "..:public_config_smk" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+  }
+}

testsuites/unittest/fs/jffs/smoke/It_vfs_jffs_Dac_001.cpp

@@ -371,6 +371,58 @@ static int TestAccess(const char *path)
     return 0;
 }
 
+static int SetReadAndSearch()
+{
+    int capNum = 2;
+    struct __user_cap_header_struct capheader;
+    struct __user_cap_data_struct capdata[capNum];
+    int ret;
+
+    memset(&capheader, 0, sizeof(struct __user_cap_header_struct));
+    memset(capdata, 0, capNum * sizeof(struct __user_cap_data_struct));
+    capdata[0].permitted = 0xffffffff;
+    capdata[1].permitted = 0xffffffff;
+    capheader.version = _LINUX_CAPABILITY_VERSION_3;
+    capdata[CAP_TO_INDEX(CAP_SETPCAP)].effective |= CAP_TO_MASK(CAP_SETPCAP);
+    capdata[CAP_TO_INDEX(CAP_SETUID)].effective |= CAP_TO_MASK(CAP_SETUID);
+    capdata[CAP_TO_INDEX(CAP_SETGID)].effective |= CAP_TO_MASK(CAP_SETGID);
+    capdata[CAP_TO_INDEX(CAP_CHOWN)].effective |= CAP_TO_MASK(CAP_CHOWN);
+    capdata[CAP_TO_INDEX(CAP_DAC_READ_SEARCH)].effective |= CAP_TO_MASK(CAP_DAC_READ_SEARCH);
+    ret = capset(&capheader, &capdata[0]);
+    ICUNIT_ASSERT_EQUAL(ret, 0, ret);
+    return 0;
+}
+
+static int TestCapReadSearch()
+{
+    int ret;
+    char filenameParent[64] = {0};
+    char filenameChild[64] = {0};
+
+    ret = setuid(0);
+    ICUNIT_ASSERT_EQUAL(ret, 0, ret);
+    ret = setgid(0);
+    ICUNIT_ASSERT_EQUAL(ret, 0, ret);
+
+    ret = mkdir("/storage/test_jffs2", 0757); // mode 0757
+    ICUNIT_ASSERT_EQUAL(ret, 0, ret);
+    sprintf(filenameParent, "%s/%s", "/storage/test_jffs2", "testParent");
+    sprintf(filenameChild, "%s/%s", filenameParent, "testChild");
+    ret = mkdir(filenameParent, 0222); // mode 0222
+    ICUNIT_ASSERT_EQUAL(ret, 0, ret);
+    SetReadAndSearch();
+    ret = mkdir(filenameChild, 0777); // mode 0777
+    ICUNIT_ASSERT_NOT_EQUAL(ret, 0, ret);
+
+    ret = rmdir(filenameParent);
+    ICUNIT_ASSERT_EQUAL(ret, 0, ret);
+
+    ret = rmdir("/storage/test_jffs2");
+    ICUNIT_ASSERT_EQUAL(ret, 0, ret);
+
+    return 0;
+}
+
 /* execve */
 /* access */
 
@@ -433,9 +485,6 @@ static int ChildFunc(VOID)
     ret = setgid(2); // gid: 2
     ICUNIT_ASSERT_EQUAL(ret, 0, ret);
 
-    capdata[0].effective = 0xffffffff;
-    capdata[1].effective = 0xffffffff;
-    (void)capset(&capheader, capdata);
     return 0;
 }
 
@@ -444,13 +493,24 @@ static int testcase(VOID)
     int ret;
     int status = 0;
     pid_t pid = fork();
-    ICUNIT_GOTO_WITHIN_EQUAL(pid, 0, 100000, pid, EXIT);
+    ICUNIT_GOTO_WITHIN_EQUAL(pid, 0, 100000, pid, EXIT); // pid must in range 0 - 100000
     if (pid == 0) {
         ret = ChildFunc();
         printf("err line :%d error code: %d\n", 0, 0);
         exit(0);
     }
 
+    ret = waitpid(pid, &status, 0);
+    ICUNIT_GOTO_EQUAL(ret, pid, ret, EXIT);
+
+    pid = fork();
+    ICUNIT_GOTO_WITHIN_EQUAL(pid, 0, 100000, pid, EXIT); // pid must in range 0 - 100000
+    if (pid == 0) {
+        ret = TestCapReadSearch();
+        printf("err line :%d error code: %d\n", 0, 0);
+        exit(0);
+    }
+
     ret = waitpid(pid, &status, 0);
     ICUNIT_GOTO_EQUAL(ret, pid, ret, EXIT);
     status = WEXITSTATUS(status);

testsuites/unittest/fs/proc/BUILD.gn

@@ -28,17 +28,29 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//build/lite/config/test.gni")
+import("../../config.gni")
 
-unittest("liteos_a_fs_procfs_unittest") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
-    "//kernel/liteos_a/test/unittest/common/include",
-    "//kernel/liteos_a/test/unittest/fs/proc",
-  ]
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
+  "../../common/include",
+  "//kernel/liteos_a/test/unittest/fs/proc",
+]
+
+sources_entry = [
+  "../../common/osTest.cpp",
+  "It_vfs_proc.cpp",
+]
+
+source_set("sources_smoke") {
+  sources = [
+  ]
+  configs += [ "../..:local_public_config" ]
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
+
+source_set("sources_other") {
   sources = [
-    "//kernel/liteos_a/test/unittest/common/osTest.cpp",
-    "It_vfs_proc.cpp",
     "full/It_vfs_proc_001.cpp",
     "full/It_vfs_proc_002.cpp",
     "full/It_vfs_proc_003.cpp",
@@ -46,7 +58,32 @@ unittest("liteos_a_fs_procfs_unittest") {
     "full/It_vfs_proc_005.cpp",
     "full/It_vfs_proc_006.cpp",
   ]
+  configs += [ "../..:local_public_config" ]
+  include_dirs = common_include_dirs
   deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
-  configs = [ "//kernel/liteos_a/test/unittest:public_config" ]
-  deps += [ "//kernel/liteos_a:kernel" ]
 }
+
+if (LOSCFG_USER_TEST_FOR_ALL == true) {
+  unittest("liteos_a_fs_procfs_unittest") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "../..:public_config_full" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+    deps += [ ":sources_other" ]
+  }
+}
+
+if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+  unittest("liteos_a_fs_procfs_unittest_door") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "../..:public_config_smk" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+  }
+}

testsuites/unittest/fs/vfat2/BUILD.gn

@@ -28,18 +28,105 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//build/lite/config/test.gni")
+import("../../config.gni")
 
-unittest("liteos_a_fs_vfat_unittest") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
-    "//kernel/liteos_a/testsuites/unittest/common/include",
-    "//kernel/liteos_a/testsuites/unittest/fs/vfs",
-    "//kernel/liteos_a/testsuites/unittest/fs/vfat2",
-  ]
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
+  "../../common/include",
+  "//kernel/liteos_a/testsuites/unittest/fs/vfs",
+  "//kernel/liteos_a/testsuites/unittest/fs/vfat2",
+]
+
+sources_entry = [
+  "../../common/osTest.cpp",
+  "VfsFatTest.cpp",
+]
+
+source_set("sources_smoke") {
+  sources = [
+    "smoke/It_vfs_fat_026.cpp",
+  ]
+  configs += [ "../..:local_public_config" ]
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
+
+if (LOSCFG_USER_TEST_PRESSURE == true) {
+  source_set("sources_pressure") {
+    sources = [
+      "pressure/It_fs_fat_performance_001.cpp",
+      "pressure/It_fs_fat_performance_002.cpp",
+      "pressure/It_fs_fat_performance_003.cpp",
+      "pressure/It_fs_fat_performance_004.cpp",
+      "pressure/It_fs_fat_performance_005.cpp",
+      "pressure/It_fs_fat_performance_006.cpp",
+      "pressure/It_fs_fat_performance_007.cpp",
+      "pressure/It_fs_fat_performance_008.cpp",
+      "pressure/It_fs_fat_performance_013.cpp",
+      "pressure/It_fs_fat_performance_014.cpp",
+      "pressure/It_fs_fat_performance_015.cpp",
+      "pressure/It_fs_fat_performance_016.cpp",
+
+      "pressure/It_fs_fat_pressure_029.cpp",
+      "pressure/It_fs_fat_pressure_030.cpp",
+      "pressure/It_fs_fat_pressure_031.cpp",
+      "pressure/It_fs_fat_pressure_038.cpp",
+      "pressure/It_fs_fat_pressure_040.cpp",
+      "pressure/It_fs_fat_pressure_041.cpp",
+      "pressure/It_fs_fat_pressure_042.cpp",
+      "pressure/It_fs_fat_pressure_301.cpp",
+      "pressure/It_fs_fat_pressure_302.cpp",
+      "pressure/It_fs_fat_pressure_303.cpp",
+      "pressure/It_fs_fat_pressure_305.cpp",
+      "pressure/It_fs_fat_pressure_306.cpp",
+      "pressure/It_fs_fat_pressure_309.cpp",
+
+      "pressure/It_vfs_fat_mutipthread_003.cpp",
+      "pressure/It_vfs_fat_mutipthread_004.cpp",
+      "pressure/It_vfs_fat_mutipthread_005.cpp",
+      "pressure/It_vfs_fat_mutipthread_006.cpp",
+      "pressure/It_vfs_fat_mutipthread_008.cpp",
+      "pressure/It_vfs_fat_mutipthread_009.cpp",
+      "pressure/It_vfs_fat_mutipthread_010.cpp",
+      "pressure/It_vfs_fat_mutipthread_012.cpp",
+      "pressure/It_vfs_fat_mutipthread_014.cpp",
+      "pressure/It_vfs_fat_mutipthread_016.cpp",
+      "pressure/It_vfs_fat_mutipthread_017.cpp",
+      "pressure/It_vfs_fat_mutipthread_018.cpp",
+      "pressure/It_vfs_fat_mutipthread_019.cpp",
+      "pressure/It_vfs_fat_mutipthread_020.cpp",
+      "pressure/It_vfs_fat_mutipthread_021.cpp",
+      "pressure/It_vfs_fat_mutipthread_022.cpp",
+      "pressure/It_vfs_fat_mutipthread_023.cpp",
+      "pressure/It_vfs_fat_mutipthread_024.cpp",
+      "pressure/It_vfs_fat_mutipthread_027.cpp",
+      "pressure/It_vfs_fat_mutipthread_029.cpp",
+      "pressure/It_vfs_fat_mutipthread_030.cpp",
+      "pressure/It_vfs_fat_mutipthread_032.cpp",
+      "pressure/It_vfs_fat_mutipthread_033.cpp",
+      "pressure/It_vfs_fat_mutipthread_035.cpp",
+      "pressure/It_vfs_fat_mutipthread_036.cpp",
+      "pressure/It_vfs_fat_mutipthread_038.cpp",
+      "pressure/It_vfs_fat_mutipthread_039.cpp",
+      "pressure/It_vfs_fat_mutipthread_040.cpp",
+      "pressure/It_vfs_fat_mutipthread_041.cpp",
+      "pressure/It_vfs_fat_mutipthread_042.cpp",
+      "pressure/It_vfs_fat_mutipthread_043.cpp",
+      "pressure/It_vfs_fat_mutipthread_044.cpp",
+      "pressure/It_vfs_fat_mutipthread_045.cpp",
+      "pressure/It_vfs_fat_mutipthread_046.cpp",
+      "pressure/It_vfs_fat_mutipthread_047.cpp",
+      "pressure/It_vfs_fat_mutipthread_048.cpp",
+      "pressure/It_vfs_fat_mutipthread_049.cpp",
+      "pressure/It_vfs_fat_mutipthread_050.cpp",
+    ]
+    include_dirs = common_include_dirs
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+  }
+}
+
+source_set("sources_other") {
   sources = [
-    "//kernel/liteos_a/testsuites/unittest/common/osTest.cpp",
-    "VfsFatTest.cpp",
     "full/It_vfs_fat_066.cpp",
     "full/It_vfs_fat_068.cpp",
     "full/It_vfs_fat_072.cpp",
@@ -106,75 +193,36 @@ unittest("liteos_a_fs_vfat_unittest") {
     "full/It_vfs_fat_903.cpp",
     "full/It_vfs_fat_904.cpp",
     "full/It_vfs_fat_909.cpp",
-
-    "pressure/It_fs_fat_performance_001.cpp",
-    "pressure/It_fs_fat_performance_002.cpp",
-    "pressure/It_fs_fat_performance_003.cpp",
-    "pressure/It_fs_fat_performance_004.cpp",
-    "pressure/It_fs_fat_performance_005.cpp",
-    "pressure/It_fs_fat_performance_006.cpp",
-    "pressure/It_fs_fat_performance_007.cpp",
-    "pressure/It_fs_fat_performance_008.cpp",
-    "pressure/It_fs_fat_performance_013.cpp",
-    "pressure/It_fs_fat_performance_014.cpp",
-    "pressure/It_fs_fat_performance_015.cpp",
-    "pressure/It_fs_fat_performance_016.cpp",
-
-    "pressure/It_fs_fat_pressure_029.cpp",
-    "pressure/It_fs_fat_pressure_030.cpp",
-    "pressure/It_fs_fat_pressure_031.cpp",
-    "pressure/It_fs_fat_pressure_038.cpp",
-    "pressure/It_fs_fat_pressure_040.cpp",
-    "pressure/It_fs_fat_pressure_041.cpp",
-    "pressure/It_fs_fat_pressure_042.cpp",
-    "pressure/It_fs_fat_pressure_301.cpp",
-    "pressure/It_fs_fat_pressure_302.cpp",
-    "pressure/It_fs_fat_pressure_303.cpp",
-    "pressure/It_fs_fat_pressure_305.cpp",
-    "pressure/It_fs_fat_pressure_306.cpp",
-    "pressure/It_fs_fat_pressure_309.cpp",
-
-    "pressure/It_vfs_fat_mutipthread_003.cpp",
-    "pressure/It_vfs_fat_mutipthread_004.cpp",
-    "pressure/It_vfs_fat_mutipthread_005.cpp",
-    "pressure/It_vfs_fat_mutipthread_006.cpp",
-    "pressure/It_vfs_fat_mutipthread_008.cpp",
-    "pressure/It_vfs_fat_mutipthread_009.cpp",
-    "pressure/It_vfs_fat_mutipthread_010.cpp",
-    "pressure/It_vfs_fat_mutipthread_012.cpp",
-    "pressure/It_vfs_fat_mutipthread_014.cpp",
-    "pressure/It_vfs_fat_mutipthread_016.cpp",
-    "pressure/It_vfs_fat_mutipthread_017.cpp",
-    "pressure/It_vfs_fat_mutipthread_018.cpp",
-    "pressure/It_vfs_fat_mutipthread_019.cpp",
-    "pressure/It_vfs_fat_mutipthread_020.cpp",
-    "pressure/It_vfs_fat_mutipthread_021.cpp",
-    "pressure/It_vfs_fat_mutipthread_022.cpp",
-    "pressure/It_vfs_fat_mutipthread_023.cpp",
-    "pressure/It_vfs_fat_mutipthread_024.cpp",
-    "pressure/It_vfs_fat_mutipthread_027.cpp",
-    "pressure/It_vfs_fat_mutipthread_029.cpp",
-    "pressure/It_vfs_fat_mutipthread_030.cpp",
-    "pressure/It_vfs_fat_mutipthread_032.cpp",
-    "pressure/It_vfs_fat_mutipthread_033.cpp",
-    "pressure/It_vfs_fat_mutipthread_035.cpp",
-    "pressure/It_vfs_fat_mutipthread_036.cpp",
-    "pressure/It_vfs_fat_mutipthread_038.cpp",
-    "pressure/It_vfs_fat_mutipthread_039.cpp",
-    "pressure/It_vfs_fat_mutipthread_040.cpp",
-    "pressure/It_vfs_fat_mutipthread_041.cpp",
-    "pressure/It_vfs_fat_mutipthread_042.cpp",
-    "pressure/It_vfs_fat_mutipthread_043.cpp",
-    "pressure/It_vfs_fat_mutipthread_044.cpp",
-    "pressure/It_vfs_fat_mutipthread_045.cpp",
-    "pressure/It_vfs_fat_mutipthread_046.cpp",
-    "pressure/It_vfs_fat_mutipthread_047.cpp",
-    "pressure/It_vfs_fat_mutipthread_048.cpp",
-    "pressure/It_vfs_fat_mutipthread_049.cpp",
-    "pressure/It_vfs_fat_mutipthread_050.cpp",
-
-    "smoke/It_vfs_fat_026.cpp",
   ]
+  configs += [ "../..:local_public_config" ]
+  include_dirs = common_include_dirs
   deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
-  configs = [ "//kernel/liteos_a/testsuites/unittest:public_config" ]
 }
+
+if (LOSCFG_USER_TEST_FOR_ALL == true) {
+  unittest("liteos_a_fs_vfat_unittest") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "../..:public_config_full" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+    if (LOSCFG_USER_TEST_PRESSURE == true) {
+      deps += [ ":sources_pressure" ]
+    }
+    deps += [ ":sources_other" ]
+  }
+}
+
+if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+  unittest("liteos_a_fs_vfat_unittest_door") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "../..:public_config_smk" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+  }
+}

testsuites/unittest/liteipc/BUILD.gn

@@ -28,21 +28,59 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//build/lite/config/test.gni")
+import("../config.gni")
 
-unittest("liteos_a_liteipc_unittest") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
-    "../common/include",
-    "../liteipc",
-  ]
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
+  "../common/include",
+  "../liteipc",
+]
+
+sources_entry = [
+  "../common/osTest.cpp",
+  "smgr_demo.cpp",
+  "it_test_liteipc.cpp",
+]
+
+source_set("sources_smoke") {
   sources = [
-    "../common/osTest.cpp",
     "smoke/liteipc_test_001.cpp",
     "smoke/liteipc_test_002.cpp",
-    "smgr_demo.cpp",
-    "it_test_liteipc.cpp",
   ]
+  configs += [ "..:local_public_config" ]
+  include_dirs = common_include_dirs
   deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
-  configs = [ "..:public_config" ]
+}
+
+source_set("sources_other") {
+  sources = [
+  ]
+  configs += [ "..:local_public_config" ]
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
+
+if (LOSCFG_USER_TEST_FOR_ALL == true) {
+  unittest("liteos_a_liteipc_unittest") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "..:public_config_full" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+    deps += [ ":sources_other" ]
+  }
+}
+
+if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+  unittest("liteos_a_liteipc_unittest_door") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "..:public_config_smk" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+  }
 }

testsuites/unittest/mem/shm/BUILD.gn

@@ -28,33 +28,70 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//build/lite/config/test.gni")
+import("../../config.gni")
 
-unittest("liteos_a_mem_shm_unittest") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
-    "../../common/include",
-    "../../mem/shm",
-  ]
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
+  "../../common/include",
+  "../../mem/shm",
+]
+
+sources_entry = [
+  "../../common/osTest.cpp",
+  "mem_shm_test.cpp",
+]
+
+source_set("sources_smoke") {
   sources = [
-    "../../common/osTest.cpp",
-    "mem_shm_test.cpp",
-    "smoke/shm_test_001.cpp",
-    "smoke/shm_test_002.cpp",
-    "smoke/shm_test_003.cpp",
-    "smoke/shm_test_004.cpp",
-    "smoke/shm_test_005.cpp",
-    "smoke/shm_test_006.cpp",
-    "smoke/shm_test_007.cpp",
-    "smoke/shm_test_008.cpp",
-    "smoke/shm_test_009.cpp",
-    "smoke/shm_test_010.cpp",
-    "smoke/shm_test_011.cpp",
-    "smoke/shm_test_012.cpp",
-    "smoke/shm_test_013.cpp",
-    "smoke/shm_test_014.cpp",
-    #    "smoke/it_test_mem_100.cpp",
+      "smoke/shm_test_001.cpp",
+      "smoke/shm_test_002.cpp",
+      "smoke/shm_test_003.cpp",
+      "smoke/shm_test_004.cpp",
+      "smoke/shm_test_005.cpp",
+      "smoke/shm_test_006.cpp",
+      "smoke/shm_test_007.cpp",
+      "smoke/shm_test_008.cpp",
+      "smoke/shm_test_009.cpp",
+      "smoke/shm_test_010.cpp",
+      "smoke/shm_test_011.cpp",
+      "smoke/shm_test_012.cpp",
+      "smoke/shm_test_013.cpp",
+      "smoke/shm_test_014.cpp",
   ]
-  configs = [ "../..:public_config" ]
+  configs += [ "../..:local_public_config" ]
+  include_dirs = common_include_dirs
   deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
 }
+
+source_set("sources_other") {
+  sources = [
+  ]
+  configs += [ "../..:local_public_config" ]
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
+
+if (LOSCFG_USER_TEST_FOR_ALL == true) {
+  unittest("liteos_a_mem_shm_unittest") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "../..:public_config_full" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+    deps += [ ":sources_other" ]
+  }
+}
+
+if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+  unittest("liteos_a_mem_shm_unittest_door") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "../..:public_config_smk" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+  }
+}

testsuites/unittest/mem/shm/mem_shm_test.cpp

@@ -41,6 +41,7 @@ public:
     static void TearDownTestCase(void) {}
 };
 
+#if defined(LOSCFG_USER_TEST_SMOKE)
 /* *
  * @tc.name: it_test_shm_001
  * @tc.desc: function for MemShmTest
@@ -91,10 +92,10 @@ HWTEST_F(MemShmTest, ItTestShm004, TestSize.Level0)
  * @tc.type: FUNC
  * @tc.require: AR000EEMQ9
  */
-/*HWTEST_F(MemShmTest, ItTestShm005, TestSize.Level0)
+HWTEST_F(MemShmTest, ItTestShm005, TestSize.Level0)
 {
-    ItTestShm005();  // bug, errno
-} */
+    ItTestShm005();
+}
 
 /* *
  * @tc.name: it_test_shm_006
@@ -161,6 +162,6 @@ HWTEST_F(MemShmTest, ItTestShm011, TestSize.Level0)
 {
     ItTestShm011();
 }
-
+#endif
 }
 // namespace OHOS

testsuites/unittest/mem/shm/smoke/shm_test_001.cpp

@@ -159,6 +159,7 @@ static int Testcase(VOID)
     ICUNIT_ASSERT_EQUAL(ret, 0, ret);
 
     ICUNIT_ASSERT_EQUAL(g_threadCount, 2, g_threadCount);
+    
     return 0;
 }
 

testsuites/unittest/mem/vm/BUILD.gn

@@ -28,17 +28,21 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//build/lite/config/test.gni")
+import("../../config.gni")
 
-unittest("liteos_a_mem_vm_unittest") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
-    "../../common/include",
-    "../../mem/vm",
-  ]
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
+  "../../common/include",
+  "../../mem/vm",
+]
+
+sources_entry = [
+  "../../common/osTest.cpp",
+  "mem_vm_test.cpp",
+]
+
+source_set("sources_smoke") {
   sources = [
-    "../../common/osTest.cpp",
-    "mem_vm_test.cpp",
     "smoke/mmap_test_001.cpp",
     "smoke/mmap_test_002.cpp",
     "smoke/mmap_test_003.cpp",
@@ -55,6 +59,40 @@ unittest("liteos_a_mem_vm_unittest") {
     "smoke/open_wmemstream_test_001.cpp",
     "smoke/user_copy_test_001.cpp",
   ]
-  configs = [ "../..:public_config" ]
+  configs += [ "../..:local_public_config" ]
+  include_dirs = common_include_dirs
   deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
 }
+
+source_set("sources_other") {
+  sources = [
+  ]
+  configs += [ "../..:local_public_config" ]
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
+
+if (LOSCFG_USER_TEST_FOR_ALL == true) {
+  unittest("liteos_a_mem_vm_unittest") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "../..:public_config_full" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+    deps += [ ":sources_other" ]
+  }
+}
+
+if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+  unittest("liteos_a_mem_vm_unittest_door") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "../..:public_config_smk" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+  }
+}

testsuites/unittest/mem/vm/mem_vm_test.cpp

@@ -41,6 +41,7 @@ public:
     static void TearDownTestCase(void) {}
 };
 
+#if defined(LOSCFG_USER_TEST_SMOKE)
 /* *
  * @tc.name: it_test_mmap_001
  * @tc.desc: function for MemVmTest
@@ -208,4 +209,5 @@ HWTEST_F(MemVmTest, open_wmemstream_test_001, TestSize.Level0)
 {
     open_wmemstream_test_001();
 }
+#endif
 } // namespace OHOS

testsuites/unittest/misc/BUILD.gn

@@ -28,32 +28,70 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//build/lite/config/test.gni")
+import("../config.gni")
 
-unittest("liteos_a_misc_unittest") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
-    "../common/include",
-    "../misc",
-  ]
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
+  "../common/include",
+  "../misc",
+]
+
+sources_entry = [
+  "../common/osTest.cpp",
+  "misc_test.cpp",
+]
+
+source_set("sources_other") {
   sources = [
-    "../common/osTest.cpp",
-    "full/misc_test_001.cpp",
-    "full/misc_test_002.cpp",
-    "full/misc_test_003.cpp",
-    "full/misc_test_004.cpp",
-    "full/misc_test_005.cpp",
     "full/misc_test_006.cpp",
     "full/misc_test_007.cpp",
-    "full/misc_test_008.cpp",
-    "full/misc_test_009.cpp",
     "full/misc_test_010.cpp",
     "full/misc_test_011.cpp",
     "full/misc_test_012.cpp",
     "full/misc_test_013.cpp",
-    "full/misc_test_014.cpp",
-    "misc_test.cpp",
   ]
-  configs = [ "..:public_config" ]
+  configs += [ "..:local_public_config" ]
+  include_dirs = common_include_dirs
   deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
 }
+
+source_set("sources_smoke") {
+  sources = [
+    "smoke/misc_test_001.cpp",
+    "smoke/misc_test_002.cpp",
+    "smoke/misc_test_003.cpp",
+    "smoke/misc_test_004.cpp",
+    "smoke/misc_test_005.cpp",
+    "smoke/misc_test_008.cpp",
+    "smoke/misc_test_009.cpp",
+    "smoke/misc_test_014.cpp",
+  ]
+  configs += [ "..:local_public_config" ]
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
+
+if (LOSCFG_USER_TEST_FOR_ALL == true) {
+  unittest("liteos_a_misc_unittest") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "..:public_config_full" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+    deps += [ ":sources_other" ]
+  }
+}
+
+if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+  unittest("liteos_a_misc_unittest_door") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "..:public_config_smk" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+  }
+}

testsuites/unittest/misc/misc_test.cpp

@@ -42,6 +42,7 @@ public:
     static void TearDownTestCase(void) {}
 };
 
+#if defined(LOSCFG_USER_TEST_SMOKE)
 /* *
  * @tc.name: IT_TEST_MISC_001
  * @tc.desc: function for MiscTest
@@ -97,6 +98,19 @@ HWTEST_F(MiscTest, ItTestMisc005, TestSize.Level0)
     ItTestMisc005();
 }
 
+/* *
+ * @tc.name: IT_TEST_MISC_014
+ * @tc.desc: function for tmpnam test
+ * @tc.type: FUNC
+ * @tc.require: AR000EEMQ9
+ */
+HWTEST_F(MiscTest, IT_TEST_MISC_014, TestSize.Level0)
+{
+    IT_TEST_MISC_014();
+}
+#endif
+
+#if defined(LOSCFG_USER_TEST_FULL)
 /* *
  * @tc.name: IT_TEST_MISC_006
  * @tc.desc: function for MiscTest
@@ -151,16 +165,6 @@ HWTEST_F(MiscTest, ItTestMisc006, TestSize.Level0)
 {
     ItTestMisc013();
 }*/
-
-/* *
- * @tc.name: IT_TEST_MISC_014
- * @tc.desc: function for tmpnam test
- * @tc.type: FUNC
- * @tc.require: AR000EEMQ9
- */
-HWTEST_F(MiscTest, IT_TEST_MISC_014, TestSize.Level0)
-{
-    IT_TEST_MISC_014();
-}
+#endif
 
 } // namespace OHOS

testsuites/unittest/net/netdb/BUILD.gn

@@ -37,16 +37,29 @@ config("net_local_config") {
   }
 }
 
-unittest("liteos_a_net_netdb_unittest") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
-    "../../common/include",
-    "./",
-  ]
-  sources = [
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
+  "../../common/include",
+  "./",
+]
+
+sources_entry = [
     "../../common/osTest.cpp",
-    "full/net_netdb_test_001.cpp",
+    "net_netdb_test.cpp",
+]
+
+source_set("sources_smoke") {
+  sources = [
+    "smoke/net_netdb_test_001.cpp",
+    "smoke/net_netdb_test_013.cpp",
+  ]
+  configs += [ "../..:local_public_config" ]
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
+
+source_set("sources_other") {
+  sources = [
     "full/net_netdb_test_002.cpp",
     "full/net_netdb_test_003.cpp",
     "full/net_netdb_test_004.cpp",
@@ -58,7 +71,6 @@ unittest("liteos_a_net_netdb_unittest") {
     "full/net_netdb_test_010.cpp",
     "full/net_netdb_test_011.cpp",
     "full/net_netdb_test_012.cpp",
-    "full/net_netdb_test_013.cpp",
     "full/net_netdb_test_014.cpp",
     "full/net_netdb_test_015.cpp",
     "full/net_netdb_test_016.cpp",
@@ -68,10 +80,33 @@ unittest("liteos_a_net_netdb_unittest") {
     "full/net_netdb_test_020.cpp",
     "full/net_netdb_test_021.cpp",
     "full/net_netdb_test_022.cpp",
-    "net_netdb_test.cpp",
-  ]
-  configs = [
-    "../..:public_config",
-    ":net_local_config",
   ]
+  configs += [ "../..:local_public_config" ]
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
 }
+
+unittest("liteos_a_net_netdb_unittest") {
+  output_extension = "bin"
+  output_dir = "$root_out_dir/test/unittest/kernel"
+  include_dirs = common_include_dirs
+  sources = sources_entry
+  configs = [ "../..:public_config_full" ]
+  configs += [ ":net_local_config" ]
+  deps = []
+  deps += [ ":sources_smoke" ]
+  deps += [ ":sources_other" ]
+}
+
+if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+  unittest("liteos_a_net_netdb_unittest_door") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "../..:public_config_smk" ]
+    configs += [ ":net_local_config" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+  }
+}

testsuites/unittest/net/netdb/net_netdb_test.cpp

@@ -49,7 +49,7 @@ public:
     static void TearDownTestCase(void) {}
 };
 
-#if defined(LOSCFG_USER_TEST_FULL) && defined(LOSCFG_USER_TEST_NET_NETDB)
+#if defined(LOSCFG_USER_TEST_SMOKE) && defined(LOSCFG_USER_TEST_NET_NETDB)
 /* *
  * @tc.name: NetNetDbTest001
  * @tc.desc: function for NetDbTest

testsuites/unittest/net/resolv/BUILD.gn

@@ -37,27 +37,64 @@ config("net_local_config") {
   }
 }
 
-unittest("liteos_a_net_resolv_unittest") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
-    "../../common/include",
-    "./",
-  ]
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
+  "../../common/include",
+  "./",
+]
+
+sources_entry = [
+  "../../common/osTest.cpp",
+  "net_resolv_test.cpp",
+]
+
+source_set("sources_smoke") {
+  sources = [
+    "smoke/net_resolv_test_001.cpp",
+    "smoke/net_resolv_test_002.cpp",
+    "smoke/net_resolv_test_003.cpp",
+    "smoke/net_resolv_test_006.cpp",
+    "smoke/net_resolv_test_007.cpp",
+  ]
+  configs += [ "../..:local_public_config" ]
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
+
+source_set("sources_other") {
   sources = [
-    "../../common/osTest.cpp",
-    "full/net_resolv_test_001.cpp",
-    "full/net_resolv_test_002.cpp",
-    "full/net_resolv_test_003.cpp",
     "full/net_resolv_test_004.cpp",
     "full/net_resolv_test_005.cpp",
-    "full/net_resolv_test_006.cpp",
-    "full/net_resolv_test_007.cpp",
     "full/net_resolv_test_008.cpp",
-    "net_resolv_test.cpp",
-  ]
-  configs = [
-    "../..:public_config",
-    ":net_local_config",
   ]
+  configs += [ "../..:local_public_config" ]
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
 }
+
+if (LOSCFG_USER_TEST_FOR_ALL == true) {
+  unittest("liteos_a_net_resolv_unittest") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "../..:public_config_full" ]
+    configs += [ ":net_local_config" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+    deps += [ ":sources_other" ]
+  }
+}
+
+if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+  unittest("liteos_a_net_resolv_unittest_door") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "../..:public_config_smk" ]
+    configs += [ ":net_local_config" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+  }
+}

testsuites/unittest/net/resolv/net_resolv_test.cpp

@@ -52,7 +52,7 @@ public:
     static void TearDownTestCase(void) {}
 };
 
-#if defined(LOSCFG_USER_TEST_FULL) && defined(LOSCFG_USER_TEST_NET_RESOLV)
+#if defined(LOSCFG_USER_TEST_SMOKE) && defined(LOSCFG_USER_TEST_NET_RESOLV)
 /* *
  * @tc.name: NetResolvTest001
  * @tc.desc: function for NetResolvTest

testsuites/unittest/net/socket/BUILD.gn

@@ -37,16 +37,19 @@ config("net_local_config") {
   }
 }
 
-unittest("liteos_a_net_socket_unittest") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
-    "../../common/include",
-    "../../net/socket",
-  ]
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
+  "../../common/include",
+  "./",
+]
+
+sources_entry = [
+  "../../common/osTest.cpp",
+  "net_socket_test.cpp",
+]
+
+source_set("sources_smoke") {
   sources = [
-    "../../common/osTest.cpp",
-    "net_socket_test.cpp",
     "smoke/net_socket_test_001.cpp",
     "smoke/net_socket_test_002.cpp",
     "smoke/net_socket_test_003.cpp",
@@ -61,9 +64,42 @@ unittest("liteos_a_net_socket_unittest") {
     "smoke/net_socket_test_012.cpp",
     "smoke/net_socket_test_013.cpp",
   ]
+  configs += [ "../..:local_public_config" ]
+  include_dirs = common_include_dirs
   deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
-  configs = [
-    "../../:public_config",
-    ":net_local_config",
-  ]
 }
+
+source_set("sources_other") {
+  sources = [
+  ]
+  configs += [ "../..:local_public_config" ]
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
+
+if (LOSCFG_USER_TEST_FOR_ALL == true) {
+  unittest("liteos_a_net_socket_unittest") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "../..:public_config_full" ]
+    configs += [ ":net_local_config" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+    deps += [ ":sources_other" ]
+  }
+}
+
+if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+  unittest("liteos_a_net_socket_unittest_door") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "../..:public_config_smk" ]
+    configs += [ ":net_local_config" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+  }
+}

testsuites/unittest/net/socket/smoke/net_socket_test_008.cpp

@@ -38,7 +38,7 @@
 
 #define SERVER_PORT 6666
 #define INVALID_SOCKET -1
-#define CLIENT_NUM 50
+#define CLIENT_NUM 25
 #define BACKLOG CLIENT_NUM
 
 static int gFds[FD_SETSIZE];

testsuites/unittest/net/socket/smoke/net_socket_test_009.cpp

@@ -38,7 +38,7 @@
 
 #define SERVER_PORT 8888
 #define INVALID_SOCKET -1
-#define CLIENT_NUM 50
+#define CLIENT_NUM 25
 #define BACKLOG CLIENT_NUM
 
 static int gFds[FD_SETSIZE];

testsuites/unittest/net/socket/smoke/net_socket_test_011.cpp

@@ -38,7 +38,7 @@
 
 #define SERVER_PORT 7777
 #define INVALID_SOCKET -1
-#define CLIENT_NUM 50
+#define CLIENT_NUM 25
 
 static int gFds[FD_SETSIZE];
 static int gBye;
@@ -97,7 +97,7 @@ static int CloseAllFd(void)
 
 static int HandleRecv(int fd)
 {
-    char buf[256];
+    char buf[128];
     int ret = recv(fd, buf, sizeof(buf)-1, 0);
     if (ret < 0) {
         LogPrintln("[%d]Error: %s", fd, strerror(errno));
@@ -151,11 +151,11 @@ static void *ClientsThread(void *param)
     LogPrintln("[%d]<%d>connected to udp://%s:%d successful", fd, thrNo, inet_ntoa(sa.sin_addr), SERVER_PORT);
 
     const char *msg[] = {
-            "hello, ",
             "ohos, ",
+            "hello, ",
             "my name is net_socket_test_011, ",
             "see u next time, ",
-            "Bye!"
+            "Bye!",
     };
 
     for (int i = 0; i < sizeof(msg) / sizeof(msg[0]); ++i) {
@@ -172,15 +172,20 @@ static void *ClientsThread(void *param)
 static int StartClients(pthread_t *cli, int cliNum)
 {
     int ret;
-    pthread_attr_t attr;
+    pthread_attr_t attr = {0};
+    struct sched_param param = { 0 };
+    int policy;
+    ret = pthread_getschedparam(pthread_self(), &policy, &param);
+    ICUNIT_ASSERT_EQUAL(ret, 0, -ret);
 
     for (int i = 0; i < cliNum; ++i) {
         ret = pthread_attr_init(&attr);
-        ICUNIT_ASSERT_EQUAL(ret, 0, ret);
+        param.sched_priority = param.sched_priority + 1;
+        pthread_attr_setinheritsched(&attr, PTHREAD_EXPLICIT_SCHED);
+        pthread_attr_setschedparam(&attr, &param);
 
         ret = pthread_create(&cli[i], &attr, ClientsThread, (void *)(intptr_t)i);
         ICUNIT_ASSERT_EQUAL(ret, 0, ret);
-
         ret = pthread_attr_destroy(&attr);
         ICUNIT_ASSERT_EQUAL(ret, 0, ret);
     }

testsuites/unittest/posix/mem/BUILD.gn

@@ -28,20 +28,58 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//build/lite/config/test.gni")
+import("../../config.gni")
 
-unittest("liteos_a_posix_mem_unittest") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
-    "../../common/include",
-    "../../posix/mem",
-  ]
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
+  "../../common/include",
+  "./",
+]
+
+sources_entry = [
+  "../../common/osTest.cpp",
+  "posix_mem_test.cpp",
+]
+
+source_set("sources_smoke") {
   sources = [
-    "../../common/osTest.cpp",
-    "posix_mem_test.cpp",
     "smoke/It_posix_mem_001.cpp",
     "smoke/It_posix_mem_003.cpp",
   ]
+  configs += [ "../..:local_public_config" ]
+  include_dirs = common_include_dirs
   deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
-  configs = [ "../..:public_config" ]
 }
+
+source_set("sources_other") {
+  sources = [
+  ]
+  configs += [ "../..:local_public_config" ]
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
+
+if (LOSCFG_USER_TEST_FOR_ALL == true) {
+  unittest("liteos_a_posix_mem_unittest") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "../..:public_config_full" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+    deps += [ ":sources_other" ]
+  }
+}
+
+if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+  unittest("liteos_a_posix_mem_unittest_door") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "../..:public_config_smk" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+  }
+}

testsuites/unittest/posix/mqueue/BUILD.gn

@@ -35,62 +35,38 @@ config("mqueue_config") {
   cflags_cc = cflags
 }
 
-unittest("liteos_a_posix_mqueue_unittest") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
-    "../../common/include",
-    "../../posix/mqueue",
-  ]
-  sourcesllt = []
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
+  "../../common/include",
+  "./",
+]
 
-  if (LOSCFG_USER_TEST_LLT == true) {
-    sourcesllt += [
-      "llt/It_posix_queue_006.cpp",
-      "llt/It_posix_queue_009.cpp",
-      "llt/It_posix_queue_022.cpp",
-      "llt/It_posix_queue_023.cpp",
-      "llt/It_posix_queue_024.cpp",
-      "llt/It_posix_queue_029.cpp",
-      "llt/It_posix_queue_034.cpp",
-      "llt/It_posix_queue_035.cpp",
-      "llt/It_posix_queue_037.cpp",
-      "llt/It_posix_queue_039.cpp",
-      "llt/It_posix_queue_045.cpp",
-      "llt/It_posix_queue_051.cpp",
-      "llt/It_posix_queue_059.cpp",
-      "llt/It_posix_queue_068.cpp",
-      "llt/It_posix_queue_092.cpp",
-      "llt/It_posix_queue_099.cpp",
-      "llt/It_posix_queue_105.cpp",
-      "llt/It_posix_queue_107.cpp",
-      "llt/It_posix_queue_131.cpp",
-      "llt/It_posix_queue_132.cpp",
-      "llt/It_posix_queue_135.cpp",
-      "llt/It_posix_queue_137.cpp",
-      "llt/It_posix_queue_138.cpp",
-      "llt/It_posix_queue_139.cpp",
-      "llt/It_posix_queue_140.cpp",
-      "llt/It_posix_queue_141.cpp",
-      "llt/It_posix_queue_142.cpp",
-      "llt/It_posix_queue_158.cpp",
-      "llt/LLT_posix_queue_001.cpp",
-      "llt/LLT_posix_queue_002.cpp",
-      "llt/LLT_posix_queue_003.cpp",
-      "llt/LLT_posix_queue_004.cpp",
-      "llt/LLT_posix_queue_005.cpp",
-      "llt/LLT_posix_queue_006.cpp",
-      "llt/LLT_posix_queue_007.cpp",
-      "llt/LLT_posix_queue_008.cpp",
-      "llt/LLT_posix_queue_009.cpp",
-      "llt/LLT_posix_queue_010.cpp",
-      "llt/LLT_posix_queue_011.cpp",
-      "llt/LLT_posix_queue_012.cpp",
-      "llt/LLT_posix_queue_013.cpp",
-    ]
-  }
+sources_entry = [
+  "../../common/osTest.cpp",
+  "posix_mqueue_test.cpp",
+]
+
+source_set("sources_smoke") {
+  sources = [
+    "smoke/It_posix_queue_001.cpp",
+    "smoke/It_posix_queue_003.cpp",
+    "smoke/It_posix_queue_028.cpp",
+    "smoke/It_posix_queue_053.cpp",
+    "smoke/It_posix_queue_144.cpp",
+    "smoke/It_posix_queue_062.cpp",
+    "smoke/It_posix_queue_205.cpp",
+    "smoke/It_posix_queue_206.cpp",
+    "smoke/It_posix_queue_207.cpp",
+    "smoke/It_posix_queue_208.cpp",
+    "smoke/It_posix_queue_209.cpp",
+  ]
+  configs += [ "../..:local_public_config" ]
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
+
+source_set("sources_other") {
   sources = [
-    "../../common/osTest.cpp",
     "full/It_posix_queue_002.cpp",
     "full/It_posix_queue_005.cpp",
     "full/It_posix_queue_008.cpp",
@@ -123,7 +99,6 @@ unittest("liteos_a_posix_mqueue_unittest") {
     "full/It_posix_queue_049.cpp",
     "full/It_posix_queue_050.cpp",
     "full/It_posix_queue_052.cpp",
-    "full/It_posix_queue_053.cpp",
     "full/It_posix_queue_054.cpp",
     "full/It_posix_queue_055.cpp",
     "full/It_posix_queue_056.cpp",
@@ -198,7 +173,6 @@ unittest("liteos_a_posix_mqueue_unittest") {
     "full/It_posix_queue_134.cpp",
     "full/It_posix_queue_136.cpp",
     "full/It_posix_queue_143.cpp",
-    "full/It_posix_queue_144.cpp",
     "full/It_posix_queue_145.cpp",
     "full/It_posix_queue_146.cpp",
     "full/It_posix_queue_147.cpp",
@@ -232,19 +206,35 @@ unittest("liteos_a_posix_mqueue_unittest") {
     "full/It_posix_queue_202.cpp",
     "full/It_posix_queue_203.cpp",
     "full/It_posix_queue_204.cpp",
-    "posix_mqueue_test.cpp",
-    "smoke/It_posix_queue_001.cpp",
-    "smoke/It_posix_queue_003.cpp",
-    "smoke/It_posix_queue_028.cpp",
-    "smoke/It_posix_queue_062.cpp",
-    "smoke/It_posix_queue_205.cpp",
-    "smoke/It_posix_queue_206.cpp",
-    "smoke/It_posix_queue_207.cpp",
-    "smoke/It_posix_queue_208.cpp",
-    "smoke/It_posix_queue_209.cpp",
   ]
-  sources += sourcesllt
+  configs += [ "../..:local_public_config" ]
+  include_dirs = common_include_dirs
   deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
-  configs = [ "../..:public_config" ]
-  configs += [ ":mqueue_config" ]
 }
+
+if (LOSCFG_USER_TEST_FOR_ALL == true) {
+  unittest("liteos_a_posix_mqueue_unittest") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "../..:public_config_full" ]
+    configs += [ ":mqueue_config" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+    deps += [ ":sources_other" ]
+  }
+}
+
+if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+  unittest("liteos_a_posix_mqueue_unittest_door") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "../..:public_config_smk" ]
+    configs += [ ":mqueue_config" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+  }
+}

testsuites/unittest/posix/mqueue/It_posix_queue.h

@@ -125,6 +125,8 @@ VOID ItPosixQueue206(VOID);
 VOID ItPosixQueue207(VOID);
 VOID ItPosixQueue208(VOID);
 VOID ItPosixQueue209(VOID);
+VOID ItPosixQueue053(VOID);
+VOID ItPosixQueue144(VOID);
 #endif
 
 #if defined(LOSCFG_USER_TEST_FULL)
@@ -166,7 +168,6 @@ VOID ItPosixQueue048(VOID);
 VOID ItPosixQueue049(VOID);
 VOID ItPosixQueue050(VOID);
 VOID ItPosixQueue052(VOID);
-VOID ItPosixQueue053(VOID);
 VOID ItPosixQueue054(VOID);
 VOID ItPosixQueue055(VOID);
 VOID ItPosixQueue056(VOID);
@@ -241,7 +242,6 @@ VOID ItPosixQueue133(VOID);
 VOID ItPosixQueue134(VOID);
 VOID ItPosixQueue136(VOID);
 VOID ItPosixQueue143(VOID);
-VOID ItPosixQueue144(VOID);
 VOID ItPosixQueue145(VOID);
 VOID ItPosixQueue146(VOID);
 VOID ItPosixQueue147(VOID);

testsuites/unittest/posix/mqueue/posix_mqueue_test.cpp

@@ -279,7 +279,6 @@ HWTEST_F(PosixMqueueTest, ItPosixQueue113, TestSize.Level0)
 {
     ItPosixQueue113();
 }
-
 #endif
 /**
  * @tc.name: IT_POSIX_QUEUE_018
@@ -1194,10 +1193,10 @@ HWTEST_F(PosixMqueueTest, ItPosixQueue154, TestSize.Level0)
  * @tc.type: FUNC
  * @tc.require: AR000EEMQ9
  */
-/* HWTEST_F(PosixMqueueTest, ItPosixQueue155, TestSize.Level0)
+HWTEST_F(PosixMqueueTest, ItPosixQueue155, TestSize.Level0)
 {
-    ItPosixQueue155();  // bug, errno
-} */
+    ItPosixQueue155();
+}
 
 /**
  * @tc.name: IT_POSIX_QUEUE_156
@@ -1316,10 +1315,10 @@ HWTEST_F(PosixMqueueTest, ItPosixQueue187, TestSize.Level0)
  * @tc.type: FUNC
  * @tc.require: AR000EEMQ9
  */
-/*HWTEST_F(PosixMqueueTest, ItPosixQueue200, TestSize.Level0)
+HWTEST_F(PosixMqueueTest, ItPosixQueue200, TestSize.Level0)
 {
-    ItPosixQueue200();  // bug, errno
-}*/
+    ItPosixQueue200();
+}
 
 /**
  * @tc.name: IT_POSIX_QUEUE_201
@@ -1327,10 +1326,10 @@ HWTEST_F(PosixMqueueTest, ItPosixQueue187, TestSize.Level0)
  * @tc.type: FUNC
  * @tc.require: AR000EEMQ9
  */
-/*HWTEST_F(PosixMqueueTest, ItPosixQueue201, TestSize.Level0)
+HWTEST_F(PosixMqueueTest, ItPosixQueue201, TestSize.Level0)
 {
-    ItPosixQueue201();  // bug, errno
-}*/
+    ItPosixQueue201();
+}
 
 /**
  * @tc.name: IT_POSIX_QUEUE_202

testsuites/unittest/posix/mqueue/smoke/It_posix_queue_053.cpp

@@ -140,32 +140,7 @@ EXIT:
     return MQUEUE_NO_ERROR;
 }
 
-/* *
-*-@test IT_POSIX_MQUEUE_053
-*-@tspec The function test for mq_send
-*-@ttitle Mq_send writes the mqueue interrupted by the signal
-*-@tprecon The mqueue,signal and pthread module is open
-*-@tbrief
-1. use the pthread_create to create a legal pthread;
-2. use the mq_send to write the mqueue in the pthread;
-3. use the pthread_create to create another legal pthread;
-4. use the mq_receive to read the mqueue in the second pthread;
-5. use the mq_close to close the mqueue in the second pthread;
-6. use the mq_unlink to delete the mqueue in the second pthread;
-7. delete all the pthreads.
-*-@texpect
-1. Return successed
-2. Return successed
-3. Return successed
-4. Return successed
-5. Return successed
-6. Return successed
-7. Sucessful operation
-*-@tprior 1
-*-@tauto TRUE
-*-@tremark
-*/
 VOID ItPosixQueue053(VOID)
 {
-    TEST_ADD_CASE("IT_POSIX_QUEUE_053", Testcase, TEST_POSIX, TEST_QUE, TEST_LEVEL2, TEST_FUNCTION);
+    TEST_ADD_CASE("ItPosixQueue053", Testcase, TEST_POSIX, TEST_QUE, TEST_LEVEL2, TEST_FUNCTION);
 }

testsuites/unittest/posix/mqueue/smoke/It_posix_queue_144.cpp

@@ -149,5 +149,5 @@ EXIT:
 
 VOID ItPosixQueue144(VOID) // IT_Layer_ModuleORFeature_No
 {
-    TEST_ADD_CASE("IT_POSIX_QUEUE_144", Testcase, TEST_POSIX, TEST_QUE, TEST_LEVEL2, TEST_FUNCTION);
+    TEST_ADD_CASE("ItPosixQueue144", Testcase, TEST_POSIX, TEST_QUE, TEST_LEVEL2, TEST_FUNCTION);
 }

testsuites/unittest/posix/pthread/BUILD.gn

@@ -35,16 +35,37 @@ config("pthread_config") {
   cflags_cc = cflags
 }
 
-unittest("liteos_a_posix_pthread_unittest") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
-    "../../common/include",
-    "../../posix/pthread",
-  ]
-  sourcesllt = []
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
+  "../../common/include",
+  "./",
+]
+
+sources_entry = [
+  "../../common/osTest.cpp",
+  "posix_pthread_test.cpp",
+]
+
+source_set("sources_smoke") {
+  sources = [
+    "smoke/It_posix_pthread_003.cpp",
+    "smoke/It_posix_pthread_004.cpp",
+    "smoke/It_posix_pthread_005.cpp",
+    "smoke/It_posix_pthread_006.cpp",
+    "smoke/It_posix_pthread_018.cpp",
+    "smoke/It_posix_pthread_019.cpp",
+    "smoke/It_posix_pthread_020.cpp",
+    "smoke/It_posix_pthread_021.cpp",
+    "smoke/It_posix_pthread_022.cpp",
+    "smoke/It_posix_pthread_203.cpp",
+  ]
+  configs += [ "../..:local_public_config" ]
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
+
+source_set("sources_other") {
   sources = [
-    "../../common/osTest.cpp",
     "full/It_posix_pthread_001.cpp",
     "full/It_posix_pthread_002.cpp",
     "full/It_posix_pthread_007.cpp",
@@ -150,20 +171,35 @@ unittest("liteos_a_posix_pthread_unittest") {
     "full/It_posix_pthread_239.cpp",
     "full/It_posix_pthread_240.cpp",
     "full/It_posix_pthread_241.cpp",
-    "posix_pthread_test.cpp",
-    "smoke/It_posix_pthread_003.cpp",
-    "smoke/It_posix_pthread_004.cpp",
-    "smoke/It_posix_pthread_005.cpp",
-    "smoke/It_posix_pthread_006.cpp",
-    "smoke/It_posix_pthread_018.cpp",
-    "smoke/It_posix_pthread_019.cpp",
-    "smoke/It_posix_pthread_020.cpp",
-    "smoke/It_posix_pthread_021.cpp",
-    "smoke/It_posix_pthread_022.cpp",
-    "smoke/It_posix_pthread_203.cpp",
   ]
-  sources += sourcesllt
+  configs += [ "../..:local_public_config" ]
+  include_dirs = common_include_dirs
   deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
-  configs = [ "../..:public_config" ]
-  configs += [ ":pthread_config" ]
 }
+
+if (LOSCFG_USER_TEST_FOR_ALL == true) {
+  unittest("liteos_a_posix_pthread_unittest") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "../..:public_config_full" ]
+    configs += [ ":pthread_config" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+    deps += [ ":sources_other" ]
+  }
+}
+
+if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+  unittest("liteos_a_posix_pthread_unittest_door") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "../..:public_config_smk" ]
+    configs += [ ":pthread_config" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+  }
+}

testsuites/unittest/process/mutex/BUILD.gn

@@ -28,17 +28,21 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//build/lite/config/test.gni")
+import("../../config.gni")
 
-unittest("liteos_a_mutex_unittest") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
-    "../../common/include",
-    "../../process/mutex",
-  ]
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
+  "../../common/include",
+  "./",
+]
+
+sources_entry = [
+  "../../common/osTest.cpp",
+  "process_mutex_test.cpp",
+]
+
+source_set("sources_smoke") {
   sources = [
-    "../../common/osTest.cpp",
-    "process_mutex_test.cpp",
     "smoke/pthread_mutex_test_001.cpp",
     "smoke/pthread_mutex_test_002.cpp",
     "smoke/pthread_mutex_test_003.cpp",
@@ -65,6 +69,40 @@ unittest("liteos_a_mutex_unittest") {
     "smoke/pthread_mutex_test_024.cpp",
     "smoke/pthread_mutex_test_025.cpp",
   ]
+  configs += [ "../..:local_public_config" ]
+  include_dirs = common_include_dirs
   deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
-  configs = [ "../..:public_config" ]
 }
+
+source_set("sources_other") {
+  sources = [
+  ]
+  configs += [ "../..:local_public_config" ]
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
+
+if (LOSCFG_USER_TEST_FOR_ALL == true) {
+  unittest("liteos_a_mutex_unittest") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "../..:public_config_full" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+    deps += [ ":sources_other" ]
+  }
+}
+
+if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+  unittest("liteos_a_mutex_unittest_door") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "../..:public_config_smk" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+  }
+}

testsuites/unittest/process/mutex/process_mutex_test.cpp

@@ -49,6 +49,7 @@ public:
     static void TearDownTestCase(void) {}
 };
 
+#if defined(LOSCFG_USER_TEST_SMOKE)
 /* *
  * @tc.name: it_test_pthread_mutex_001
  * @tc.desc: function for ProcessMutexTest
@@ -325,4 +326,5 @@ HWTEST_F(ProcessMutexTest, ItTestPthreadMutex025, TestSize.Level0)
 {
     ItTestPthreadMutex025();
 }
+#endif
 } // namespace OHOS

testsuites/unittest/process/process/BUILD.gn

@@ -28,17 +28,21 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//build/lite/config/test.gni")
+import("../../config.gni")
 
-unittest("liteos_a_process_unittest") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
-    "../../common/include",
-    "../../process/process",
-  ]
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
+  "../../common/include",
+  "./",
+]
+
+sources_entry = [
+  "../../common/osTest.cpp",
+  "process_process_test.cpp",
+]
+
+source_set("sources_smoke") {
   sources = [
-    "../../common/osTest.cpp",
-    "process_process_test.cpp",
     "smoke/process_test_001.cpp",
     "smoke/process_test_002.cpp",
     "smoke/process_test_004.cpp",
@@ -114,6 +118,40 @@ unittest("liteos_a_process_unittest") {
     "smp/process_test_smp_007.cpp",
     "smp/process_test_smp_008.cpp",
   ]
+  configs += [ "../..:local_public_config" ]
+  include_dirs = common_include_dirs
   deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
-  configs = [ "../..:public_config" ]
 }
+
+source_set("sources_other") {
+  sources = [
+  ]
+  configs += [ "../..:local_public_config" ]
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
+
+if (LOSCFG_USER_TEST_FOR_ALL == true) {
+  unittest("liteos_a_process_unittest") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "../..:public_config_full" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+    deps += [ ":sources_other" ]
+  }
+}
+
+if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+  unittest("liteos_a_process_unittest_door") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "../..:public_config_smk" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+  }
+}

testsuites/unittest/process/process/process_process_test.cpp

@@ -70,6 +70,7 @@ public:
     static void TearDownTestCase(void) {}
 };
 
+#if defined(LOSCFG_USER_TEST_SMOKE)
 /* *
  * @tc.name: it_test_process_001
  * @tc.desc: function for ProcessProcessTest
@@ -890,6 +891,6 @@ HWTEST_F(ProcessProcessTest, ItTestProcessSmp008, TestSize.Level0)
 {
     ItTestProcessSmp008();
 }
-
+#endif
 #endif
 } // namespace OHOS

testsuites/unittest/process/pthread/BUILD.gn

@@ -28,17 +28,21 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//build/lite/config/test.gni")
+import("../../config.gni")
 
-unittest("liteos_a_pthread_unittest") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
-    "../../common/include",
-    "../../process/pthread",
-  ]
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
+  "../../common/include",
+  "./",
+]
+
+sources_entry = [
+  "../../common/osTest.cpp",
+  "process_pthread_test.cpp",
+]
+
+source_set("sources_smoke") {
   sources = [
-    "../../common/osTest.cpp",
-    "process_pthread_test.cpp",
     "smoke/pthread_atfork_test_001.cpp",
     "smoke/pthread_atfork_test_002.cpp",
     "smoke/pthread_cond_test_001.cpp",
@@ -64,6 +68,40 @@ unittest("liteos_a_pthread_unittest") {
     "smoke/pthread_test_018.cpp",
     "smoke/pthread_test_019.cpp",
   ]
+  configs += [ "../..:local_public_config" ]
+  include_dirs = common_include_dirs
   deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
-  configs = [ "../..:public_config" ]
 }
+
+source_set("sources_other") {
+  sources = [
+  ]
+  configs += [ "../..:local_public_config" ]
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
+
+if (LOSCFG_USER_TEST_FOR_ALL == true) {
+  unittest("liteos_a_pthread_unittest") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "../..:public_config_full" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+    deps += [ ":sources_other" ]
+  }
+}
+
+if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+  unittest("liteos_a_pthread_unittest_door") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "../..:public_config_smk" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+  }
+}

testsuites/unittest/process/pthread/process_pthread_test.cpp

@@ -51,6 +51,7 @@ public:
     static void TearDownTestCase(void) {}
 };
 
+#if defined(LOSCFG_USER_TEST_SMOKE)
 /* *
  * @tc.name: it_test_pthread_001
  * @tc.desc: function for ProcessPthreadTest
@@ -165,8 +166,8 @@ HWTEST_F(ProcessPthreadTest, ItTestPthread010, TestSize.Level0)
 {
     ItTestPthread010();
 }
-
 #endif
+
 /* *
  * @tc.name: it_test_pthread_011
  * @tc.desc: function for ProcessPthreadTest
@@ -211,8 +212,8 @@ HWTEST_F(ProcessPthreadTest, ItTestPthread014, TestSize.Level0)
 {
     ItTestPthread014();
 }
-
 #endif
+
 /* *
  * @tc.name: it_test_pthread_015
  * @tc.desc: function for ProcessPthreadTest
@@ -322,4 +323,5 @@ HWTEST_F(ProcessPthreadTest, ItTestPthreadCond002, TestSize.Level0)
 {
     ItTestPthreadCond002();
 }
+#endif
 } // namespace OHOS

testsuites/unittest/process/rwlock/BUILD.gn

@@ -28,20 +28,58 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//build/lite/config/test.gni")
+import("../../config.gni")
 
-unittest("liteos_a_rwlock_unittest") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
-    "../../common/include",
-    "../../process/rwlock",
-  ]
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
+  "../../common/include",
+  "./",
+]
+
+sources_entry = [
+  "../../common/osTest.cpp",
+  "process_rwlock_test.cpp",
+]
+
+source_set("sources_smoke") {
   sources = [
-    "../../common/osTest.cpp",
-    "process_rwlock_test.cpp",
     "smoke/pthread_rwlock_test_001.cpp",
     "smoke/pthread_rwlock_test_002.cpp",
   ]
+  configs += [ "../..:local_public_config" ]
+  include_dirs = common_include_dirs
   deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
-  configs = [ "../..:public_config" ]
 }
+
+source_set("sources_other") {
+  sources = [
+  ]
+  configs += [ "../..:local_public_config" ]
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
+
+if (LOSCFG_USER_TEST_FOR_ALL == true) {
+  unittest("liteos_a_rwlock_unittest") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "../..:public_config_full" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+    deps += [ ":sources_other" ]
+  }
+}
+
+if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+  unittest("liteos_a_rwlock_unittest_door") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "../..:public_config_smk" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+  }
+}

testsuites/unittest/process/rwlock/process_rwlock_test.cpp

@@ -41,6 +41,7 @@ public:
     static void TearDownTestCase(void) {}
 };
 
+#if defined(LOSCFG_USER_TEST_SMOKE)
 /* *
  * @tc.name: it_test_pthread_rwlock_001
  * @tc.desc: function for ProcessRwlockTest
@@ -62,4 +63,5 @@ HWTEST_F(ProcessRwlockTest, ItTestPthreadRwlock002, TestSize.Level0)
 {
     ItTestPthreadRwlock002();
 }
+#endif
 } // namespace OHOS

testsuites/unittest/process/spinlock/BUILD.gn

@@ -28,19 +28,57 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//build/lite/config/test.gni")
+import("../../config.gni")
 
-unittest("liteos_a_spinlock_unittest") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
-    "../../common/include",
-    "../../process/spinlock",
-  ]
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
+  "../../common/include",
+  "./",
+]
+
+sources_entry = [
+  "../../common/osTest.cpp",
+  "process_spinlock_test.cpp",
+]
+
+source_set("sources_smoke") {
   sources = [
-    "../../common/osTest.cpp",
-    "process_spinlock_test.cpp",
     "smoke/pthread_spinlock_test_001.cpp",
   ]
+  configs += [ "../..:local_public_config" ]
+  include_dirs = common_include_dirs
   deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
-  configs = [ "../..:public_config" ]
 }
+
+source_set("sources_other") {
+  sources = [
+  ]
+  configs += [ "../..:local_public_config" ]
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
+
+if (LOSCFG_USER_TEST_FOR_ALL == true) {
+  unittest("liteos_a_spinlock_unittest") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "../..:public_config_full" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+    deps += [ ":sources_other" ]
+  }
+}
+
+if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+  unittest("liteos_a_spinlock_unittest_door") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "../..:public_config_smk" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+  }
+}

testsuites/unittest/process/spinlock/process_spinlock_test.cpp

@@ -41,6 +41,7 @@ public:
     static void TearDownTestCase(void) {}
 };
 
+#if defined(LOSCFG_USER_TEST_SMOKE)
 /* *
  * @tc.name: it_test_pthread_spinlock_001
  * @tc.desc: function for ProcessSpinlockTest
@@ -51,4 +52,5 @@ HWTEST_F(ProcessSpinlockTest, ItTestPthreadSpinlock001, TestSize.Level0)
 {
     ItTestPthreadSpinlock001();
 }
+#endif
 } // namespace OHOS

testsuites/unittest/security/capability/BUILD.gn

@@ -1,19 +1,56 @@
 # Copyright (C) 2019. Huawei Technologies Co., Ltd. All rights reserved.
 import("//build/lite/config/test.gni")
+import("../../config.gni")
 
-unittest("liteos_a_security_capability_unittest") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
-    "../../common/include",
-    "../../security/capability",
-    "//third_party/bounds_checking_function/include",
-  ]
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
+  "../../common/include",
+  "./",
+]
+
+sources_entry = [
+  "../../common/osTest.cpp",
+  "security_capability_test.cpp",
+]
+
+source_set("sources_smoke") {
   sources = [
-    "../../common/osTest.cpp",
-    "security_capability_test.cpp",
     "smoke/cap_test_001.cpp",
   ]
-  configs = [ "../..:public_config" ]
+  configs += [ "../..:local_public_config" ]
+  include_dirs = common_include_dirs
   deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
 }
+
+source_set("sources_other") {
+  sources = [
+  ]
+  configs += [ "../..:local_public_config" ]
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
+
+if (LOSCFG_USER_TEST_FOR_ALL == true) {
+  unittest("liteos_a_security_capability_unittest") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "../..:public_config_full" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+    deps += [ ":sources_other" ]
+  }
+}
+
+if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+  unittest("liteos_a_security_capability_unittest_door") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "../..:public_config_smk" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+  }
+}

testsuites/unittest/security/capability/security_capability_test.cpp

@@ -42,6 +42,7 @@ public:
     static void TearDownTestCase(void) {}
 };
 
+#if defined(LOSCFG_USER_TEST_SMOKE)
 /**
  * @tc.name: It_Test_Cap_001
  * @tc.desc: function for SecurityCapbilityTest
@@ -52,4 +53,5 @@ HWTEST_F(SecurityCapabilityTest, ItTestCap001, TestSize.Level0)
 {
     ItTestCap001();
 }
+#endif
 } // namespace OHOS

testsuites/unittest/security/capability/smoke/cap_test_001.cpp

@@ -47,12 +47,13 @@ static void Sigac(int param)
 
 static void Child()
 {
-    int i = 100;
+    int i = 10;
     signal(25, Sigac);
 
     while (i--) {
-        sleep(10);
+        sleep(1);
     }
+    exit(0);
 }
 
 static int TestChild(VOID)
@@ -131,7 +132,7 @@ static int TestChild(VOID)
     ret = capset(&capheader, &capdata[0]);
     ret = sched_setparam(pid, &param);
     ICUNIT_ASSERT_EQUAL(ret, -1, ret);
-
+    wait(nullptr);
     exit(92);
 
     return 0;

testsuites/unittest/security/reugid/BUILD.gn

@@ -28,19 +28,57 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//build/lite/config/test.gni")
+import("../../config.gni")
 
-unittest("liteos_a_security_reugid_unittest") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
-    "../../common/include",
-    "../../security/reugid",
-  ]
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
+  "../../common/include",
+  "./",
+]
+
+sources_entry = [
+  "../../common/osTest.cpp",
+  "security_reugid_test.cpp",
+]
+
+source_set("sources_smoke") {
   sources = [
-    "../../common/osTest.cpp",
-    "security_reugid_test.cpp",
     "smoke/reugid_test_001.cpp",
   ]
-  configs = [ "../..:public_config" ]
+  configs += [ "../..:local_public_config" ]
+  include_dirs = common_include_dirs
   deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
 }
+
+source_set("sources_other") {
+  sources = [
+  ]
+  configs += [ "../..:local_public_config" ]
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
+
+if (LOSCFG_USER_TEST_FOR_ALL == true) {
+  unittest("liteos_a_security_reugid_unittest") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "../..:public_config_full" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+    deps += [ ":sources_other" ]
+  }
+}
+
+if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+  unittest("liteos_a_security_reugid_unittest_door") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "../..:public_config_smk" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+  }
+}

testsuites/unittest/security/reugid/security_reugid_test.cpp

@@ -42,6 +42,7 @@ public:
     static void TearDownTestCase(void) {}
 };
 
+#if defined(LOSCFG_USER_TEST_SMOKE)
 /**
  * @tc.name: ItTestReugid001
  * @tc.desc: function for SecurityReugidTest
@@ -52,4 +53,5 @@ HWTEST_F(SecurityReugidTest, ItTestReugid001, TestSize.Level0)
 {
     ItTestReugid001();
 }
+#endif
 } // namespace OHOS

testsuites/unittest/security/vid/BUILD.gn

@@ -28,19 +28,57 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//build/lite/config/test.gni")
+import("../../config.gni")
 
-unittest("liteos_a_security_vid_unittest") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
-    "../../common/include",
-    "../../security/vid",
-  ]
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
+  "../../common/include",
+  "./",
+]
+
+sources_entry = [
+  "../../common/osTest.cpp",
+  "security_vid_test.cpp",
+]
+
+source_set("sources_smoke") {
   sources = [
-    "../../common/osTest.cpp",
-    "security_vid_test.cpp",
     "smoke/vid_test_001.cpp",
   ]
-  configs = [ "../..:public_config" ]
+  configs += [ "../..:local_public_config" ]
+  include_dirs = common_include_dirs
   deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
 }
+
+source_set("sources_other") {
+  sources = [
+  ]
+  configs += [ "../..:local_public_config" ]
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
+
+if (LOSCFG_USER_TEST_FOR_ALL == true) {
+  unittest("liteos_a_security_vid_unittest") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "../..:public_config_full" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+    deps += [ ":sources_other" ]
+  }
+}
+
+if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+  unittest("liteos_a_security_vid_unittest_door") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "../..:public_config_smk" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+  }
+}

testsuites/unittest/security/vid/security_vid_test.cpp

@@ -42,6 +42,7 @@ public:
     static void TearDownTestCase(void) {}
 };
 
+#if defined(LOSCFG_USER_TEST_SMOKE)
 /**
  * @tc.name: It_Sec_Vid_001
  * @tc.desc: function for SecurityVidTest
@@ -52,4 +53,5 @@ HWTEST_F(SecurityVidTest, ItSecVid001, TestSize.Level0)
 {
     ItSecVid001();
 }
+#endif
 } // namespace OHOS

testsuites/unittest/signal/BUILD.gn

@@ -28,17 +28,21 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//build/lite/config/test.gni")
+import("../config.gni")
 
-unittest("liteos_a_signal_unittest") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
-    "../common/include",
-    "../signal",
-  ]
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
+  "../common/include",
+  "./",
+]
+
+sources_entry = [
+  "../common/osTest.cpp",
+  "signal_test.cpp",
+]
+
+source_set("sources_smoke") {
   sources = [
-    "../common/osTest.cpp",
-    "signal_test.cpp",
     "smoke/It_ipc_fdclr_001.cpp",
     "smoke/It_ipc_fdisset_001.cpp",
     "smoke/It_ipc_fdset_001.cpp",
@@ -103,6 +107,40 @@ unittest("liteos_a_signal_unittest") {
     "smoke/sigset_test_001.cpp",
     "smoke/sigset_test_002.cpp",
   ]
+  configs += [ "..:local_public_config" ]
+  include_dirs = common_include_dirs
   deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
-  configs = [ "..:public_config" ]
 }
+
+source_set("sources_other") {
+  sources = [
+  ]
+  configs += [ "..:local_public_config" ]
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
+
+if (LOSCFG_USER_TEST_FOR_ALL == true) {
+  unittest("liteos_a_signal_unittest") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "..:public_config_full" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+    deps += [ ":sources_other" ]
+  }
+}
+
+if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+  unittest("liteos_a_signal_unittest_door") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "..:public_config_smk" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+  }
+}

testsuites/unittest/signal/signal_test.cpp

@@ -40,6 +40,7 @@ public:
     static void TearDownTestCase(void) {}
 };
 
+#if defined(LOSCFG_USER_TEST_SMOKE)
 /* *
  * @tc.name: IT_POSIX_SIGNAL_001
  * @tc.desc: function for SignalTest
@@ -645,4 +646,5 @@ HWTEST_F(SignalTest, ItIpcSigpromask001, TestSize.Level0)
 {
     ItIpcSigpromask001();
 }
+#endif
 } // namespace OHOS

testsuites/unittest/sys/BUILD.gn

@@ -28,16 +28,21 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//build/lite/config/test.gni")
+import("../config.gni")
 
-unittest("liteos_a_sys_unittest") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
-    "../common/include",
-    "../sys",
-  ]
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
+  "../common/include",
+  "./",
+]
+
+sources_entry = [
+  "../common/osTest.cpp",
+  "sys_unit_test.cpp",
+]
+
+source_set("sources_smoke") {
   sources = [
-    "../common/osTest.cpp",
     "smoke/sys_test_001.cpp",
     "smoke/sys_test_004.cpp",
     "smoke/sys_test_005.cpp",
@@ -66,8 +71,41 @@ unittest("liteos_a_sys_unittest") {
     "smoke/sys_test_029.cpp",
     "smoke/sys_test_030.cpp",
     "smoke/sys_test_031.cpp",
-    "sys_unit_test.cpp",
   ]
+  configs += [ "..:local_public_config" ]
+  include_dirs = common_include_dirs
   deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
-  configs = [ "..:public_config" ]
 }
+
+source_set("sources_other") {
+  sources = [
+  ]
+  configs += [ "..:local_public_config" ]
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
+
+if (LOSCFG_USER_TEST_FOR_ALL == true) {
+  unittest("liteos_a_sys_unittest") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "..:public_config_full" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+    deps += [ ":sources_other" ]
+  }
+}
+
+if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+  unittest("liteos_a_sys_unittest_door") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "..:public_config_smk" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+  }
+}

testsuites/unittest/sys/sys_unit_test.cpp

@@ -42,6 +42,7 @@ public:
     static void TearDownTestCase(void) {}
 };
 
+#if defined(LOSCFG_USER_TEST_SMOKE)
 /* *
  * @tc.name: IT_TEST_SYS_004
  * @tc.desc: function for SysTest
@@ -217,4 +218,5 @@ HWTEST_F(SysTest, IT_TEST_SYS_031, TestSize.Level0)
 {
     IT_TEST_SYS_031();
 }
+#endif
 } // namespace OHOS

testsuites/unittest/time/clock/BUILD.gn

@@ -28,16 +28,21 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//build/lite/config/test.gni")
+import("../../config.gni")
 
-unittest("liteos_a_time_clock_unittest") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
-    "../../common/include",
-    "../../time/clock",
-  ]
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
+  "../../common/include",
+  "./",
+]
+
+sources_entry = [
+  "../../common/osTest.cpp",
+  "time_clock_test.cpp",
+]
+
+source_set("sources_smoke") {
   sources = [
-    "../../common/osTest.cpp",
     "smoke/clock_test_001.cpp",
     "smoke/clock_test_002.cpp",
     "smoke/clock_test_003.cpp",
@@ -46,11 +51,44 @@ unittest("liteos_a_time_clock_unittest") {
     "smoke/clock_test_007.cpp",
     "smoke/clock_test_008.cpp",
     "smoke/clock_test_009.cpp",
-    "smoke/clock_test_010.cpp",
     "smoke/clock_test_011.cpp",
     "smoke/clock_test_012.cpp",
-    "time_clock_test.cpp",
   ]
+  configs += [ "../..:local_public_config" ]
+  include_dirs = common_include_dirs
   deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
-  configs = [ "../../../unittest:public_config" ]
 }
+
+source_set("sources_other") {
+  sources = [
+    "full/clock_test_010.cpp",
+  ]
+  configs += [ "../..:local_public_config" ]
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
+
+if (LOSCFG_USER_TEST_FOR_ALL == true) {
+  unittest("liteos_a_time_clock_unittest") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "../..:public_config_full" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+    deps += [ ":sources_other" ]
+  }
+}
+
+if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+  unittest("liteos_a_time_clock_unittest_door") {
+    output_extension = "bin"
+    output_dir = "$root_out_dir/test/unittest/kernel"
+    include_dirs = common_include_dirs
+    sources = sources_entry
+    configs = [ "../..:public_config_smk" ]
+    deps = []
+    deps += [ ":sources_smoke" ]
+  }
+}

testsuites/unittest/time/clock/full/clock_test_010.cpp

@@ -64,7 +64,7 @@ static int SleepTest(int64_t expectTime)
     LogPrintln("slept time (expected --> actual): %" PRId64 "ns --> %" PRId64 "ns, delta: %" PRId64 "ns\n", expectTime,
         escapeTime, escapeTime - expectTime);
 
-    g_failCnt += (escapeTime < expectTime || (escapeTime - expectTime) >= 90000000); // 20000000, 2 ticks.
+    g_failCnt += (escapeTime < expectTime || (escapeTime - expectTime) >= 20000000); // 20000000, 2 ticks.
 
     return 0;
 }