!1165 【回合到OH-4.0-Beta1】调整TDD测试用例

Merge pull request !1165 from zhangdengyu/cherry-pick-1684917288

BUILD.gn

@@ -299,7 +299,7 @@ config("public") {
 
   configs += [
     "$HDFTOPDIR:public",
-    "$DRIVERS_LITEOS_DIR:public",
+    "//drivers/liteos:public",
   ]
 
   if (HAVE_DEVICE_SDK) {
@@ -324,8 +324,8 @@ group("modules") {
   ]
 
   deps += [
-    "$DRIVERS_LITEOS_DIR",
-    "$HDFTOPDIR",
+    "//drivers/liteos",
+    HDFTOPDIR,
   ]
 
   if (HAVE_DEVICE_SDK) {
@@ -351,7 +351,7 @@ group("liteos_a") {
     deps += [
       ":apps",
       ":tests",
-      "$THIRDPARTY_MUSL_DIR/scripts/build_lite:strip",
+      "//third_party/musl/scripts/build_lite:strip",
     ]
     if (liteos_skip_make == false) {
       deps += [ ":make" ]

apps/mksh/BUILD.gn

@@ -29,7 +29,7 @@
 
 import("//build/lite/config/component/lite_component.gni")
 import("//kernel/liteos_a/liteos.gni")
-import("$THIRDPARTY_MKSH_DIR/mksh.gni")
+import("//third_party/mksh/mksh.gni")
 
 group("mksh") {
   deps = [ ":build_mksh" ]
@@ -42,7 +42,7 @@ copy("copy_mksh_src") {
 
 build_ext_component("build_mksh") {
   deps = [ ":copy_mksh_src" ]
-  deps += [ "$THIRDPARTY_MUSL_DIR:sysroot_lite" ]
+  deps += [ "//third_party/musl:sysroot_lite" ]
   exec_path = rebase_path("$target_out_dir/mksh_build")
 
   cflags = [

apps/toybox/BUILD.gn

@@ -29,7 +29,7 @@
 
 import("//build/lite/config/component/lite_component.gni")
 import("//kernel/liteos_a/liteos.gni")
-import("$THIRDPARTY_TOYBOX_DIR/toybox.gni")
+import("//third_party/toybox/toybox.gni")
 
 group("toybox") {
   deps = [ ":build_toybox" ]
@@ -51,7 +51,7 @@ build_ext_component("build_toybox") {
     ":copy_toybox_config",
     ":copy_toybox_src",
   ]
-  deps += [ "$THIRDPARTY_MUSL_DIR:sysroot_lite" ]
+  deps += [ "//third_party/musl:sysroot_lite" ]
   exec_path = rebase_path("$target_out_dir/toybox_build")
 
   cflags = [

drivers/char/bch/BUILD.gn

@@ -28,7 +28,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//kernel/liteos_a/liteos.gni")
-import("$THIRDPARTY_NUTTX_DIR/NuttX.gni")
+import("//third_party/NuttX/NuttX.gni")
 
 module_switch = defined(LOSCFG_FS_VFS_BLOCK_DEVICE)
 module_name = get_path_info(rebase_path("."), "name")

drivers/char/video/BUILD.gn

@@ -28,7 +28,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//kernel/liteos_a/liteos.gni")
-import("$THIRDPARTY_NUTTX_DIR/NuttX.gni")
+import("//third_party/NuttX/NuttX.gni")
 
 module_switch = defined(LOSCFG_DRIVERS_VIDEO)
 module_name = get_path_info(rebase_path("."), "name")

fs/fat/BUILD.gn

@@ -28,7 +28,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//kernel/liteos_a/liteos.gni")
-import("$THIRDPARTY_FATFS_DIR/FatFs.gni")
+import("//third_party/FatFs/FatFs.gni")
 
 module_switch = defined(LOSCFG_FS_FAT)
 module_name = get_path_info(rebase_path("."), "name")

fs/jffs2/BUILD.gn

@@ -31,7 +31,7 @@ import("//kernel/liteos_a/liteos.gni")
 
 module_switch = defined(LOSCFG_FS_JFFS)
 module_name = get_path_info(rebase_path("."), "name")
-linux_path = rebase_path("$KERNEL_LINUX_DIR")
+linux_path = rebase_path("//kernel/linux/linux-5.10")
 out_path = rebase_path(target_out_dir)
 
 kernel_module(module_name) {

fs/nfs/BUILD.gn

@@ -28,7 +28,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//kernel/liteos_a/liteos.gni")
-import("$THIRDPARTY_NUTTX_DIR/NuttX.gni")
+import("//third_party/NuttX/NuttX.gni")
 
 module_switch = defined(LOSCFG_FS_NFS)
 module_name = get_path_info(rebase_path("."), "name")

fs/ramfs/BUILD.gn

@@ -28,7 +28,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//kernel/liteos_a/liteos.gni")
-import("$THIRDPARTY_NUTTX_DIR/NuttX.gni")
+import("//third_party/NuttX/NuttX.gni")
 
 module_switch = defined(LOSCFG_FS_RAMFS)
 module_name = get_path_info(rebase_path("."), "name")

fs/romfs/BUILD.gn

@@ -28,7 +28,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//kernel/liteos_a/liteos.gni")
-import("$THIRDPARTY_NUTTX_DIR/NuttX.gni")
+import("//third_party/NuttX/NuttX.gni")
 
 module_switch = defined(LOSCFG_FS_ROMFS)
 module_name = get_path_info(rebase_path("."), "name")

fs/vfs/BUILD.gn

@@ -28,7 +28,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//kernel/liteos_a/liteos.gni")
-import("$THIRDPARTY_NUTTX_DIR/NuttX.gni")
+import("//third_party/NuttX/NuttX.gni")
 
 module_switch = defined(LOSCFG_FS_VFS)
 module_name = get_path_info(rebase_path("."), "name")

kernel/Kconfig

@@ -67,6 +67,51 @@ config PAGE_TABLE_FINE_LOCK
     help
       This option will enable fine lock for page table.
 
+######################### config options of container ####################
+config KERNEL_CONTAINER
+    bool "Enable container Feature"
+    default n
+    depends on KERNEL_VM
+
+config PID_CONTAINER
+    bool "Enable pid container Feature"
+    default n
+    depends on KERNEL_CONTAINER
+
+config UTS_CONTAINER
+    bool "Enable uts container Feature"
+    default n
+    depends on KERNEL_CONTAINER
+
+config MNT_CONTAINER
+    bool "Enable mnt container Feature"
+    default n
+    depends on KERNEL_CONTAINER
+
+config CHROOT
+    bool "Enable chroot"
+    default n
+    depends on MNT_CONTAINER
+
+config IPC_CONTAINER
+    bool "Enable ipc container Feature"
+    default n
+    depends on KERNEL_CONTAINER
+
+config TIME_CONTAINER
+    bool "Enable time container"
+    default n
+    depends on KERNEL_CONTAINER
+
+config USER_CONTAINER
+    bool "Enable user container"
+    default n
+    depends on KERNEL_CONTAINER
+
+config NET_CONTAINER
+    bool "Enable net container"
+    default n
+    depends on KERNEL_CONTAINER
 
 ######################### config options of extended #####################
 source "kernel/extended/Kconfig"

kernel/base/BUILD.gn

@@ -32,6 +32,15 @@ import("//kernel/liteos_a/liteos.gni")
 module_name = get_path_info(rebase_path("."), "name")
 kernel_module(module_name) {
   sources = [
+    "container/los_container.c",
+    "container/los_credentials.c",
+    "container/los_ipc_container.c",
+    "container/los_mnt_container.c",
+    "container/los_net_container.c",
+    "container/los_pid_container.c",
+    "container/los_time_container.c",
+    "container/los_user_container.c",
+    "container/los_uts_container.c",
     "core/los_bitmap.c",
     "core/los_info.c",
     "core/los_process.c",

kernel/base/Makefile

@@ -39,6 +39,7 @@ LOCAL_SRCS := 	$(wildcard ipc/*.c) $(wildcard core/*.c) $(wildcard mem/membox/*.
 		$(wildcard mp/*.c) \
 		$(wildcard sched/*.c) \
 		$(wildcard vm/*.c) \
+		$(wildcard container/*.c)
 
 
 LOCAL_FLAGS := $(LITEOS_CFLAGS_INTERWORK) -Wno-frame-address

kernel/base/core/los_swtmr.c

@@ -583,7 +583,7 @@ STATIC INLINE BOOL SwtmrRunqueueFind(SortLinkAttribute *swtmrSortLink, SCHED_TL_
 STATIC BOOL SwtmrTimeListFind(SCHED_TL_FIND_FUNC checkFunc, UINTPTR arg)
 {
     for (UINT16 cpuid = 0; cpuid < LOSCFG_KERNEL_CORE_NUM; cpuid++) {
-        SortLinkAttribute *swtmrSortLink = &g_swtmrRunqueue[cpuid].swtmrSortLink;
+        SortLinkAttribute *swtmrSortLink = &g_swtmrRunqueue[ArchCurrCpuid()].swtmrSortLink;
         if (SwtmrRunqueueFind(swtmrSortLink, checkFunc, arg)) {
             return TRUE;
         }

kernel/extended/BUILD.gn

@@ -32,7 +32,6 @@ import("//kernel/liteos_a/liteos.gni")
 group("extended") {
   deps = [
     "blackbox",
-    "container",
     "cppsupport",
     "cpup",
     "dynload",
@@ -53,7 +52,6 @@ group("extended") {
 config("public") {
   configs = [
     "blackbox:public",
-    "container:public",
     "cpup:public",
     "dynload:public",
     "hidumper:public",

kernel/extended/Kconfig

@@ -113,54 +113,6 @@ config KERNEL_HOOK
     default n
     depends on KERNEL_EXTKERNEL && DEBUG_VERSION
 
-
-######################### config options of container ####################
-config KERNEL_CONTAINER
-    bool "Enable container Feature"
-    default n
-    depends on KERNEL_VM
-
-config PID_CONTAINER
-    bool "Enable pid container Feature"
-    default n
-    depends on KERNEL_CONTAINER
-
-config UTS_CONTAINER
-    bool "Enable uts container Feature"
-    default n
-    depends on KERNEL_CONTAINER
-
-config MNT_CONTAINER
-    bool "Enable mnt container Feature"
-    default n
-    depends on KERNEL_CONTAINER
-
-config CHROOT
-    bool "Enable chroot"
-    default n
-    depends on MNT_CONTAINER
-
-config IPC_CONTAINER
-    bool "Enable ipc container Feature"
-    default n
-    depends on KERNEL_CONTAINER
-
-config TIME_CONTAINER
-    bool "Enable time container"
-    default n
-    depends on KERNEL_CONTAINER
-
-config USER_CONTAINER
-    bool "Enable user container"
-    default n
-    depends on KERNEL_CONTAINER
-
-config NET_CONTAINER
-    bool "Enable net container"
-    default n
-    depends on KERNEL_CONTAINER
-
-
 ######################### config options of trace #########################
 source "kernel/extended/trace/Kconfig"
 

kernel/extended/container/BUILD.gn

@@ -1,65 +0,0 @@
-# Copyright (c) 2023-2023 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.
-
-import("//kernel/liteos_a/liteos.gni")
-
-module_switch = defined(LOSCFG_KERNEL_CONTAINER)
-module_name = get_path_info(rebase_path("."), "name")
-kernel_module(module_name) {
-  sources = [ "los_container.c" ]
-  if (defined(LOSCFG_IPC_CONTAINER)) {
-    sources += [ "los_ipc_container.c" ]
-  }
-  if (defined(LOSCFG_MNT_CONTAINER)) {
-    sources += [ "los_mnt_container.c" ]
-  }
-  if (defined(LOSCFG_NET_CONTAINER)) {
-    sources += [ "los_net_container.c" ]
-  }
-  if (defined(LOSCFG_PID_CONTAINER)) {
-    sources += [ "los_pid_container.c" ]
-  }
-  if (defined(LOSCFG_TIME_CONTAINER)) {
-    sources += [ "los_time_container.c" ]
-  }
-  if (defined(LOSCFG_USER_CONTAINER)) {
-    sources += [
-      "los_credentials.c",
-      "los_user_container.c",
-    ]
-  }
-  if (defined(LOSCFG_UTS_CONTAINER)) {
-    sources += [ "los_uts_container.c" ]
-  }
-
-  public_configs = [ ":public" ]
-}
-
-config("public") {
-  include_dirs = [ "." ]
-}

kernel/extended/container/Makefile

@@ -1,63 +0,0 @@
-# Copyright (c) 2023-2023 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.
-
-include $(LITEOSTOPDIR)/config.mk
-
-MODULE_NAME := $(notdir $(shell pwd))
-
-LOCAL_SRCS := $(wildcard *.c)
-
-ifneq ($(LOSCFG_IPC_CONTAINER), y)
-LOCAL_SRCS += $(filter-out los_ipc_container.c, $(LOCAL_SRCS))
-endif
-
-ifneq ($(LOSCFG_MNT_CONTAINER), y)
-LOCAL_SRCS += $(filter-out los_mnt_container.c, $(LOCAL_SRCS))
-endif
-
-ifneq ($(LOSCFG_NET_CONTAINER), y)
-LOCAL_SRCS += $(filter-out los_net_container.c, $(LOCAL_SRCS))
-endif
-
-ifneq ($(LOSCFG_PID_CONTAINER), y)
-LOCAL_SRCS += $(filter-out los_pid_container.c, $(LOCAL_SRCS))
-endif
-
-ifneq ($(LOSCFG_TIME_CONTAINER), y)
-LOCAL_SRCS += $(filter-out los_time_container.c, $(LOCAL_SRCS))
-endif
-
-ifneq ($(LOSCFG_USER_CONTAINER), y)
-LOCAL_SRCS += $(filter-out los_credentials.c los_user_container.c, $(LOCAL_SRCS))
-endif
-
-ifneq ($(LOSCFG_UTS_CONTAINER), y)
-LOCAL_SRCS += $(filter-out los_uts_container.c, $(LOCAL_SRCS))
-endif
-
-include $(MODULE)

kernel/extended/hilog/BUILD.gn

@@ -33,7 +33,7 @@ module_switch = defined(LOSCFG_BASE_CORE_HILOG)
 module_name = get_path_info(rebase_path("."), "name")
 kernel_module(module_name) {
   sources = [
-    "$HIVIEWDFX_HILOG_LITE_DIR/frameworks/featured/hiview_log.c",
+    "//base/hiviewdfx/hilog_lite/frameworks/featured/hiview_log.c",
     "los_hilog.c",
   ]
 
@@ -42,8 +42,8 @@ kernel_module(module_name) {
 
 config("public") {
   include_dirs = [
-    "$HIVIEWDFX_HILOG_LITE_DIR/interfaces/native/kits",
-    "$HIVIEWDFX_HILOG_LITE_DIR/interfaces/native/kits/hilog",
+    "//base/hiviewdfx/hilog_lite/interfaces/native/kits",
+    "//base/hiviewdfx/hilog_lite/interfaces/native/kits/hilog",
     ".",
   ]
 }

kernel/extended/pipes/BUILD.gn

@@ -28,7 +28,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//kernel/liteos_a/liteos.gni")
-import("$THIRDPARTY_NUTTX_DIR/NuttX.gni")
+import("//third_party/NuttX/NuttX.gni")
 
 module_switch = defined(LOSCFG_KERNEL_PIPE)
 module_name = get_path_info(rebase_path("."), "name")

lib/libc/musl/BUILD.gn

@@ -28,8 +28,11 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//kernel/liteos_a/liteos.gni")
-import("$THIRDPARTY_MUSL_DIR/porting/liteos_a/kernel/musl.gni")
-import("$THIRDPARTY_OPTIMIZED_ROUTINES_DIR/optimized-routines.gni")
+
+MUSLDIR = "$LITEOSTHIRDPARTY/musl"
+
+import("//third_party/optimized-routines/optimized-routines.gni")
+import("$MUSLDIR/porting/liteos_a/kernel/musl.gni")
 
 module_switch = defined(LOSCFG_LIBC_MUSL)
 module_name = get_path_info(rebase_path("."), "name")

lib/libc/newlib/BUILD.gn

@@ -27,7 +27,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//kernel/liteos_a/liteos.gni")
-import("$THIRDPARTY_MUSL_DIR/porting/liteos_a_newlib/kernel/newlib.gni")
+import("//third_party/musl/porting/liteos_a_newlib/kernel/newlib.gni")
 
 module_switch = defined(LOSCFG_LIBC_NEWLIB)
 module_name = get_path_info(rebase_path("."), "name")

lib/libscrew/BUILD.gn

@@ -28,7 +28,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//kernel/liteos_a/liteos.gni")
-import("$THIRDPARTY_FREEBSD_DIR/FreeBSD.gni")
+import("//third_party/FreeBSD/FreeBSD.gni")
 
 module_name = get_path_info(rebase_path("."), "name")
 kernel_module(module_name) {

lib/libsec/BUILD.gn

@@ -28,7 +28,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//kernel/liteos_a/liteos.gni")
-import("$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR/libsec_src.gni")
+import("//third_party/bounds_checking_function/libsec_src.gni")
 
 module_switch = defined(LOSCFG_LIB_LIBC)
 module_name = get_path_info(rebase_path("."), "name")

liteos.gni

@@ -32,19 +32,6 @@ import("$root_out_dir/config.gni")
 LITEOSTOPDIR = "//kernel/liteos_a"
 LITEOSTHIRDPARTY = "//third_party"
 HDFTOPDIR = "//drivers/hdf_core/adapter/khdf/liteos"
-HIVIEWDFX_HILOG_LITE_DIR = "//base/hiviewdfx/hilog_lite"
-DRIVERS_LITEOS_DIR = "//drivers/liteos"
-THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR =
-    "//third_party/bounds_checking_function"
-THIRDPARTY_FATFS_DIR = "//third_party/FatFs"
-THIRDPARTY_NUTTX_DIR = "//third_party/NuttX"
-THIRDPARTY_MUSL_DIR = "//third_party/musl"
-THIRDPARTY_TOYBOX_DIR = "//third_party/toybox"
-THIRDPARTY_MKSH_DIR = "//third_party/mksh"
-THIRDPARTY_FREEBSD_DIR = "//third_party/FreeBSD"
-THIRDPARTY_OPTIMIZED_ROUTINES_DIR = "//third_party/optimized-routines"
-THIRDPARTY_GOOGLETEST_DIR = "//third_party/googletest"
-KERNEL_LINUX_DIR = "//kernel/linux/linux-5.10"
 
 ARCH = ""
 if (defined(LOSCFG_ARCH_ARM_AARCH32)) {
@@ -148,8 +135,8 @@ set_defaults("kernel_module") {
     "$LITEOSTOPDIR:los_config",
   ]
   visibility = [
-    ":*",
     "$LITEOSTOPDIR:*",
+    ":*",
     "..:*",
     "../..:*",
   ]

testsuites/kernel/BUILD.gn

@@ -45,8 +45,8 @@ config("liteos_kernel_test_public") {
     "$LITEOSTOPDIR/arch/arm/arm/include",
     "$LITEOSTOPDIR/arch/arm/include",
     "$LITEOSTOPDIR/extended/include",
-    "$THIRDPARTY_MUSL_DIR/porting/liteos_a/kernel/include",
-    "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR/include/",
+    "//third_party/musl/porting/liteos_a/kernel/include",
+    "//third_party/bounds_checking_function/include/",
     "$LITEOSTOPDIR/lib/libscrew/include",
     "$LITEOSTOPDIR/fs/vfs",
     "$LITEOSTOPDIR/fs/proc/include",

testsuites/unittest/basic/BUILD.gn

@@ -26,6 +26,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//build/lite/config/test.gni")
+import("//kernel/liteos_a/testsuites/unittest/config.gni")
 import("./config.gni")
 
 if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
@@ -38,7 +40,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
     sources_full = []
     sources += sources_full
     configs = [ "..:public_config_for_door" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }
 
@@ -51,6 +53,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
     sources += sources_smoke
     sources += sources_full
     configs = [ "..:public_config_for_all" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }

testsuites/unittest/basic/config.gni

@@ -27,11 +27,10 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//build/lite/config/test.gni")
-import("//kernel/liteos_a/liteos.gni")
 import("//kernel/liteos_a/testsuites/unittest/config.gni")
 
 common_include_dirs = [
-  "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
+  "//third_party/googletest/googletest/include",
   "../common/include",
 ]
 

testsuites/unittest/container/BUILD.gn

@@ -26,6 +26,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//build/lite/config/test.gni")
+import("//kernel/liteos_a/testsuites/unittest/config.gni")
 import("./config.gni")
 
 config("container_config") {
@@ -67,7 +69,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
       "..:public_config_for_door",
       ":container_config",
     ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }
 
@@ -83,6 +85,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
       "..:public_config_for_all",
       ":container_config",
     ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }

testsuites/unittest/container/config.gni

@@ -26,12 +26,10 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-import("//build/lite/config/test.gni")
-import("//kernel/liteos_a/liteos.gni")
 import("//kernel/liteos_a/testsuites/unittest/config.gni")
 
 common_include_dirs = [
-  "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
+  "//third_party/googletest/googletest/include",
   "../common/include",
   "$TEST_UNITTEST_DIR/container",
 ]

testsuites/unittest/drivers/BUILD.gn

@@ -26,6 +26,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//build/lite/config/test.gni")
+import("//kernel/liteos_a/testsuites/unittest/config.gni")
 import("./config.gni")
 
 if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
@@ -38,7 +40,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
     sources_full = []
     sources += sources_full
     configs = [ "..:public_config_for_door" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }
 
@@ -51,6 +53,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
     sources += sources_smoke
     sources += sources_full
     configs = [ "..:public_config_for_all" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }

testsuites/unittest/drivers/config.gni

@@ -27,11 +27,10 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//build/lite/config/test.gni")
-import("//kernel/liteos_a/liteos.gni")
 import("//kernel/liteos_a/testsuites/unittest/config.gni")
 
 common_include_dirs = [
-  "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
+  "//third_party/googletest/googletest/include",
   "../common/include",
 ]
 

testsuites/unittest/extended/BUILD.gn

@@ -26,6 +26,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//build/lite/config/test.gni")
+import("//kernel/liteos_a/testsuites/unittest/config.gni")
 import("./config.gni")
 
 if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
@@ -38,7 +40,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
     sources_full = []
     sources += sources_full
     configs = [ "..:public_config_for_door" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }
 
@@ -51,6 +53,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
     sources += sources_smoke
     sources += sources_full
     configs = [ "..:public_config_for_all" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }

testsuites/unittest/extended/config.gni

@@ -27,11 +27,10 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//build/lite/config/test.gni")
-import("//kernel/liteos_a/liteos.gni")
 import("//kernel/liteos_a/testsuites/unittest/config.gni")
 
 common_include_dirs = [
-  "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
+  "//third_party/googletest/googletest/include",
   "../common/include",
 ]
 

testsuites/unittest/extended/signal/full/It_ipc_pipe_002.cpp

@@ -53,7 +53,7 @@ static UINT32 Testcase(VOID)
         ret = write(pipeFd[1], "hello world", 12); // 12, "hello world" length and '\0'
         printf("write first status: %d\n", ret);
         if (ret != 12) { // 12, "hello world" length and '\0'
-            exit(11);    // 11, the value of son process unexpected exit, convenient to debug
+            exit(11);    // 11, the value of son process unexpect exit, convenient to debug
         }
         *sharedflag = 1;
         close(pipeFd[1]);

testsuites/unittest/extended/signal/full/It_ipc_pipe_003.cpp

@@ -55,7 +55,7 @@ static UINT32 Testcase(VOID)
         ret = write(pipeFd[1], "Hello world", TAR_STR_LEN);
         printf("write first status: %d\n", ret);
         if (ret != TAR_STR_LEN) {
-            exit(11); // 11, the value of son process unexpected exit, convenient to debug
+            exit(11); // 11, the value of son process unexpect exit, convenient to debug
         }
         *sharedflag = 1;
         close(pipeFd[1]);

testsuites/unittest/extended/signal/full/It_ipc_sigaction_001.cpp

@@ -69,7 +69,7 @@ static UINT32 Testcase(VOID)
 
         ret = sigaction(SIGCHLD, &oldact, NULL);
         if (ret == -1) {
-            exit(6); // 6, the value of son process unexpected exit, convenient to debug
+            exit(6); // 6, the value of son process unexpect exit, convenient to debug
         }
         sleep(1);
         printf("---son--cnt check----%d--------\n", g_actionCnt1);

testsuites/unittest/extended/signal/full/signal_test_001.cpp

@@ -90,31 +90,31 @@ static int TestCase(void)
             printf("errline  = %d\n", __LINE__);
             exit(-1);
         }
-        ret = kill(10, 31); // 10, kill process pid; 31, signal.
+        ret = kill(10, 31); // 10, kill process pid; 31, sigal.
         if (retValue != -1 || errno != EINVAL) {
             printf("errline  = %d\n", __LINE__);
             exit(-1);
         }
-        ret = kill(10, 32); // 10, kill process pid; 32, signal.
+        ret = kill(10, 32); // 10, kill process pid; 32, sigal.
         if (retValue != -1 || errno != EINVAL) {
             printf("errline  = %d\n", __LINE__);
             exit(-1);
         }
 
-        ret = kill(2, 32); // 2, kill process pid; 32, signal.
+        ret = kill(2, 32); // 2, kill process pid; 32, sigal.
         if (retValue != -1 || errno != EINVAL) {
             printf("errline  = %d\n", __LINE__);
             exit(-1);
         }
 
         printf("test EPERM begin\n");
-        ret = kill(2, 5); // 2, kill process pid; 5, signal.
+        ret = kill(2, 5); // 2, kill process pid; 5, sigal.
         if (retValue != -1 || errno != EPERM) {
             printf("errline  = %d\n", __LINE__);
             exit(-1);
         }
 
-        ret = kill(3, 5); // 3, kill process pid; 5, signal.
+        ret = kill(3, 5); // 3, kill process pid; 5, sigal.
         if (retValue != -1 || errno != EPERM) {
             printf("errline  = %d\n", __LINE__);
             exit(-1);
@@ -126,7 +126,7 @@ static int TestCase(void)
             exit(-1);
         }
 
-        ret = kill(1, 5); // 5, kill signal num .
+        ret = kill(1, 5); // 5, kill sigal num .
         if (retValue != -1 || errno != EPERM) {
             printf("errline  = %d\n", __LINE__);
             exit(-1);

testsuites/unittest/extended/signal/full/signal_test_007.cpp

@@ -40,7 +40,7 @@ static void SigChildResponse(int signo)
     wait(nullptr);
 }
 
-/* Register SIGCHLD, through signal to restore the child memory */
+/* Register SIGCHLD, through signal to restore the child memery */
 static int TestSigKillResp()
 {
     void (*ret)(int) = nullptr;

testsuites/unittest/extended/signal/full/signal_test_008.cpp

@@ -38,7 +38,7 @@ void SigChildResponse(int signo)
     wait(nullptr);
 }
 
-/* Register SIGCHLD, through signal to restore the child memory */
+/* Register SIGCHLD, through signal to restore the child memery */
 static int TestSigKillWaitFromSigChild()
 {
     void (*ret)(int);

testsuites/unittest/extended/signal/full/signal_test_025.cpp

@@ -88,7 +88,7 @@ static int TestBlock()
         printf("\n\n");
 
         printf("Signal Pause(2)\n");
-        printf("To test whether pause can release the signal\n");
+        printf("To test whether pause can relese the signal\n");
         alarm(clock);
         retValue = sighold(sig);
         if (retValue != 0) {

testsuites/unittest/extended/signal/smoke/signal_test_042.cpp

@@ -67,7 +67,7 @@ static UINT32 TestCase()
     sigemptyset(&set);
     sigprocmask(SIG_SETMASK, &set, NULL);
 
-    printf("check invalid sigset ...\n");
+    printf("check invlid sigset ...\n");
     int rt = sigaddset(&set, 0);
     ICUNIT_ASSERT_EQUAL(rt, -1, rt);
     ICUNIT_ASSERT_EQUAL(errno, EINVAL, errno);
@@ -79,19 +79,19 @@ static UINT32 TestCase()
 
     siginfo_t si;
     time1.tv_sec = -1;
-    printf("check invalid timespec: tv_sec=-1 ...\n");
+    printf("check invlid timespec: tv_sec=-1 ...\n");
     ret = SigtimedwaitFailTest(&set, &si, &time1, EINVAL);
     ICUNIT_ASSERT_EQUAL(ret, 0, ret);
 
     time1.tv_sec = 1;
     time1.tv_nsec = -1;
-    printf("check invalid timespec: tv_nsec=-1 ...\n");
+    printf("check invlid timespec: tv_nsec=-1 ...\n");
     ret = SigtimedwaitFailTest(&set, &si, &time1, EINVAL);
     ICUNIT_ASSERT_EQUAL(ret, 0, ret);
 
     time1.tv_sec = 1;
     time1.tv_nsec = 1000 * 1000 * 1000 + 1; // 1000, set the nsec of time.
-    printf("check invalid timespec: tv_nsec overflow ...\n");
+    printf("check invlid timespec: tv_nsec overflow ...\n");
     ret = SigtimedwaitFailTest(&set, &si, &time1, EINVAL);
     ICUNIT_ASSERT_EQUAL(ret, 0, ret);
 

testsuites/unittest/fs/BUILD.gn

@@ -27,6 +27,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//build/lite/config/test.gni")
+import("//kernel/liteos_a/testsuites/unittest/config.gni")
 import("./config.gni")
 
 if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
@@ -41,7 +43,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
     sources_pressure = []
     sources += sources_pressure
     configs = [ "..:public_config_for_door" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }
 
@@ -56,7 +58,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
     sources_pressure = []
     sources += sources_pressure
     configs = [ "..:public_config_for_all" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }
 
@@ -72,6 +74,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_HIGH) {
     sources += sources_full
     sources += sources_pressure
     configs = [ "..:public_config_for_pressure" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }

testsuites/unittest/fs/config.gni

@@ -27,11 +27,10 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//build/lite/config/test.gni")
-import("//kernel/liteos_a/liteos.gni")
 import("//kernel/liteos_a/testsuites/unittest/config.gni")
 
 common_include_dirs = [
-  "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
+  "//third_party/googletest/googletest/include",
   "../common/include",
 ]
 

testsuites/unittest/libc/io/BUILD.gn

@@ -26,6 +26,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//build/lite/config/test.gni")
+import("//kernel/liteos_a/testsuites/unittest/config.gni")
 import("./config.gni")
 
 config("libc_config") {
@@ -47,7 +49,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
     sources += sources_full
     configs = [ "../..:public_config_for_door" ]
     configs += [ ":libc_config" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }
 
@@ -61,6 +63,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
     sources += sources_full
     configs = [ "../..:public_config_for_all" ]
     configs += [ ":libc_config" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }

testsuites/unittest/libc/io/config.gni

@@ -27,11 +27,10 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//build/lite/config/test.gni")
-import("//kernel/liteos_a/liteos.gni")
 import("//kernel/liteos_a/testsuites/unittest/config.gni")
 
 common_include_dirs = [
-  "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
+  "//third_party/googletest/googletest/include",
   "../../common/include",
 ]
 

testsuites/unittest/libc/misc/BUILD.gn

@@ -26,6 +26,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//build/lite/config/test.gni")
+import("//kernel/liteos_a/testsuites/unittest/config.gni")
 import("./config.gni")
 
 config("libc_config") {
@@ -47,7 +49,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
     sources += sources_full
     configs = [ "../..:public_config_for_door" ]
     configs += [ ":libc_config" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }
 
@@ -61,6 +63,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
     sources += sources_full
     configs = [ "../..:public_config_for_all" ]
     configs += [ ":libc_config" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }

testsuites/unittest/libc/misc/config.gni

@@ -27,11 +27,10 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//build/lite/config/test.gni")
-import("//kernel/liteos_a/liteos.gni")
 import("//kernel/liteos_a/testsuites/unittest/config.gni")
 
 common_include_dirs = [
-  "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
+  "//third_party/googletest/googletest/include",
   "../../common/include",
 ]
 

testsuites/unittest/libc/posix/BUILD.gn

@@ -26,6 +26,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//build/lite/config/test.gni")
+import("//kernel/liteos_a/testsuites/unittest/config.gni")
 import("./config.gni")
 
 config("libc_config") {
@@ -47,7 +49,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
     sources += sources_full
     configs = [ "../..:public_config_for_door" ]
     configs += [ ":libc_config" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }
 
@@ -61,6 +63,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
     sources += sources_full
     configs = [ "../..:public_config_for_all" ]
     configs += [ ":libc_config" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }

testsuites/unittest/libc/posix/config.gni

@@ -27,11 +27,10 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//build/lite/config/test.gni")
-import("//kernel/liteos_a/liteos.gni")
 import("//kernel/liteos_a/testsuites/unittest/config.gni")
 
 common_include_dirs = [
-  "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
+  "//third_party/googletest/googletest/include",
   "../../common/include",
 ]
 

testsuites/unittest/libc/sys/BUILD.gn

@@ -26,6 +26,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//build/lite/config/test.gni")
+import("//kernel/liteos_a/testsuites/unittest/config.gni")
 import("./config.gni")
 
 config("libc_config") {
@@ -47,7 +49,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
     sources += sources_full
     configs = [ "../..:public_config_for_door" ]
     configs += [ ":libc_config" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }
 
@@ -61,6 +63,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
     sources += sources_full
     configs = [ "../..:public_config_for_all" ]
     configs += [ ":libc_config" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }

testsuites/unittest/libc/sys/config.gni

@@ -27,11 +27,10 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//build/lite/config/test.gni")
-import("//kernel/liteos_a/liteos.gni")
 import("//kernel/liteos_a/testsuites/unittest/config.gni")
 
 common_include_dirs = [
-  "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
+  "//third_party/googletest/googletest/include",
   "../../common/include",
 ]
 

testsuites/unittest/libc/time/BUILD.gn

@@ -26,6 +26,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//build/lite/config/test.gni")
+import("//kernel/liteos_a/testsuites/unittest/config.gni")
 import("./config.gni")
 
 config("libc_config") {
@@ -47,7 +49,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
     sources += sources_full
     configs = [ "../..:public_config_for_door" ]
     configs += [ ":libc_config" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }
 
@@ -61,6 +63,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
     sources += sources_full
     configs = [ "../..:public_config_for_all" ]
     configs += [ ":libc_config" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }

testsuites/unittest/libc/time/config.gni

@@ -27,11 +27,10 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//build/lite/config/test.gni")
-import("//kernel/liteos_a/liteos.gni")
 import("//kernel/liteos_a/testsuites/unittest/config.gni")
 
 common_include_dirs = [
-  "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
+  "//third_party/googletest/googletest/include",
   "../../common/include",
 ]
 

testsuites/unittest/libc/util/BUILD.gn

@@ -26,6 +26,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//build/lite/config/test.gni")
+import("//kernel/liteos_a/testsuites/unittest/config.gni")
 import("./config.gni")
 
 config("libc_config") {
@@ -47,7 +49,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
     sources += sources_full
     configs = [ "../..:public_config_for_door" ]
     configs += [ ":libc_config" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }
 
@@ -61,6 +63,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
     sources += sources_full
     configs = [ "../..:public_config_for_all" ]
     configs += [ ":libc_config" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }

testsuites/unittest/libc/util/config.gni

@@ -27,11 +27,10 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//build/lite/config/test.gni")
-import("//kernel/liteos_a/liteos.gni")
 import("//kernel/liteos_a/testsuites/unittest/config.gni")
 
 common_include_dirs = [
-  "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
+  "//third_party/googletest/googletest/include",
   "../../common/include",
 ]
 

testsuites/unittest/net/BUILD.gn

@@ -26,6 +26,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//build/lite/config/test.gni")
+import("//kernel/liteos_a/testsuites/unittest/config.gni")
 import("./config.gni")
 
 config("net_config") {
@@ -53,7 +55,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
     sources += sources_full
     configs = [ "..:public_config_for_door" ]
     configs += [ ":net_config" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }
 
@@ -67,6 +69,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
     sources += sources_full
     configs = [ "..:public_config_for_all" ]
     configs += [ ":net_config" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }

testsuites/unittest/net/config.gni

@@ -27,11 +27,10 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//build/lite/config/test.gni")
-import("//kernel/liteos_a/liteos.gni")
 import("//kernel/liteos_a/testsuites/unittest/config.gni")
 
 common_include_dirs = [
-  "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
+  "//third_party/googletest/googletest/include",
   "../common/include",
 ]
 

testsuites/unittest/process/basic/process/BUILD.gn

@@ -26,6 +26,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//build/lite/config/test.gni")
+import("//kernel/liteos_a/testsuites/unittest/config.gni")
 import("./config.gni")
 
 if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
@@ -38,7 +40,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
     sources_full = []
     sources += sources_full
     configs = [ "../../..:public_config_for_door" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }
 
@@ -51,6 +53,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
     sources += sources_smoke
     sources += sources_full
     configs = [ "../../..:public_config_for_all" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }

testsuites/unittest/process/basic/process/config.gni

@@ -27,11 +27,10 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//build/lite/config/test.gni")
-import("//kernel/liteos_a/liteos.gni")
 import("//kernel/liteos_a/testsuites/unittest/config.gni")
 
 common_include_dirs = [
-  "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
+  "//third_party/googletest/googletest/include",
   "../../../common/include",
 ]
 

testsuites/unittest/process/basic/pthread/BUILD.gn

@@ -26,6 +26,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//build/lite/config/test.gni")
+import("//kernel/liteos_a/testsuites/unittest/config.gni")
 import("./config.gni")
 
 if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
@@ -38,7 +40,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
     sources_full = []
     sources += sources_full
     configs = [ "../../..:public_config_for_door" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }
 
@@ -51,6 +53,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
     sources += sources_smoke
     sources += sources_full
     configs = [ "../../..:public_config_for_all" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }

testsuites/unittest/process/basic/pthread/config.gni

@@ -27,11 +27,10 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//build/lite/config/test.gni")
-import("//kernel/liteos_a/liteos.gni")
 import("//kernel/liteos_a/testsuites/unittest/config.gni")
 
 common_include_dirs = [
-  "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
+  "//third_party/googletest/googletest/include",
   "../../../common/include",
 ]
 

testsuites/unittest/process/basic/pthread/smoke/pthread_test_011.cpp

@@ -46,7 +46,7 @@ void child1(void)
     while (1) {
         ret = pthread_getschedparam(pthread, &newPolicy, &param);
         if (ret != 0) {
-            printf("pthread_getschedparam failed  ! %d error: %d\n", __LINE__, errno);
+            printf("pthread_getschedparam failed  ! %d erro: %d\n", __LINE__, errno);
             exit(255); // 255, set a special exit code.
         }
 

testsuites/unittest/process/fs/BUILD.gn

@@ -26,6 +26,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//build/lite/config/test.gni")
+import("//kernel/liteos_a/testsuites/unittest/config.gni")
 import("./config.gni")
 
 if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
@@ -38,7 +40,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
     sources_full = []
     sources += sources_full
     configs = [ "../..:public_config_for_door" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }
 
@@ -51,6 +53,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
     sources += sources_smoke
     sources += sources_full
     configs = [ "../..:public_config_for_all" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }

testsuites/unittest/process/fs/config.gni

@@ -27,11 +27,10 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//build/lite/config/test.gni")
-import("//kernel/liteos_a/liteos.gni")
 import("//kernel/liteos_a/testsuites/unittest/config.gni")
 
 common_include_dirs = [
-  "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
+  "//third_party/googletest/googletest/include",
   "../../common/include",
 ]
 

testsuites/unittest/process/lock/BUILD.gn

@@ -26,6 +26,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//build/lite/config/test.gni")
+import("//kernel/liteos_a/testsuites/unittest/config.gni")
 import("./config.gni")
 
 if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
@@ -38,7 +40,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
     sources_full = []
     sources += sources_full
     configs = [ "../..:public_config_for_door" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }
 
@@ -51,6 +53,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
     sources += sources_smoke
     sources += sources_full
     configs = [ "../..:public_config_for_all" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }

testsuites/unittest/process/lock/config.gni

@@ -27,11 +27,10 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//build/lite/config/test.gni")
-import("//kernel/liteos_a/liteos.gni")
 import("//kernel/liteos_a/testsuites/unittest/config.gni")
 
 common_include_dirs = [
-  "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
+  "//third_party/googletest/googletest/include",
   "../../common/include",
 ]
 

testsuites/unittest/process/plimits/BUILD.gn

@@ -26,6 +26,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//build/lite/config/test.gni")
+import("//kernel/liteos_a/testsuites/unittest/config.gni")
 import("./config.gni")
 
 if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
@@ -38,7 +40,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
     sources_full = []
     sources += sources_full
     configs = [ "../..:public_config_for_door" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }
 
@@ -51,6 +53,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
     sources += sources_smoke
     sources += sources_full
     configs = [ "../..:public_config_for_all" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }

testsuites/unittest/process/plimits/config.gni

@@ -27,11 +27,10 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//build/lite/config/test.gni")
-import("//kernel/liteos_a/liteos.gni")
 import("//kernel/liteos_a/testsuites/unittest/config.gni")
 
 common_include_dirs = [
-  "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
+  "//third_party/googletest/googletest/include",
   "../../common/include",
 ]
 
@@ -93,7 +92,7 @@ process_plimits_sources_smoke = [
 process_plimits_sources_full = []
 
 # plimits module
-if (LOSCFG_USER_TEST_PROCESS_PLIMITS == true) {
+if (LOSCFG_USER_TEST_PROCESS == true) {
   common_include_dirs += process_plimits_include_dirs
   sources_entry += process_plimits_sources_entry
   sources_smoke += process_plimits_sources_smoke

testsuites/unittest/security/BUILD.gn

@@ -26,6 +26,8 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+import("//build/lite/config/test.gni")
+import("//kernel/liteos_a/testsuites/unittest/config.gni")
 import("./config.gni")
 
 if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
@@ -38,7 +40,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
     sources_full = []
     sources += sources_full
     configs = [ "..:public_config_for_door" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }
 
@@ -51,6 +53,6 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
     sources += sources_smoke
     sources += sources_full
     configs = [ "..:public_config_for_all" ]
-    deps = [ "$THIRDPARTY_BOUNDS_CHECKING_FUNCTION_DIR:libsec_shared" ]
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
 }

testsuites/unittest/security/config.gni

@@ -27,11 +27,10 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//build/lite/config/test.gni")
-import("//kernel/liteos_a/liteos.gni")
 import("//kernel/liteos_a/testsuites/unittest/config.gni")
 
 common_include_dirs = [
-  "$THIRDPARTY_GOOGLETEST_DIR/googletest/include",
+  "//third_party/googletest/googletest/include",
   "../common/include",
 ]