full & smoke separate

Change-Id: I885610a62b980bd3720b337aced886450338bdcf

testsuites/unittest/BUILD.gn

@@ -29,133 +29,289 @@
 
 import("config.gni")
 
-local_flags = []
+local_flags_smoke = []
+local_flags_full = []
 if (board_name == "hispark_taurus") {
-  local_flags += [ "-DLOSCFG_USER_TEST_SMP" ]
+  local_flags_smoke += [ "-DLOSCFG_USER_TEST_SMP" ]
+  local_flags_full += [ "-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 += [ "-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_smk") {
+  cflags = [ "-fpermissive" ]
+  cflags += [
+    "-O2",
+    "-fbuiltin",
+    "-Wno-narrowing",
+  ]
+  cflags += local_flags_smoke
+  cflags_cc = cflags
 }
 
-config("public_config") {
+config("public_config_full") {
   cflags = [ "-fpermissive" ]
   cflags += [
     "-O2",
     "-fbuiltin",
     "-Wno-narrowing",
   ]
-  cflags += local_flags
+  cflags += local_flags_full
   cflags_cc = cflags
 }
 
 group("unittest") {
   deps = []
-  if (LOSCFG_USER_TEST_UTIL == true && LOSCFG_USER_TEST_SMOKE == true) {
-    deps += [ "util:liteos_a_util_unittest_door" ]
+  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_TIME_TIMER == true && LOSCFG_USER_TEST_SMOKE == true) {
-    deps += [ "time/timer:liteos_a_time_timer_unittest_door" ]
+      if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+        deps += [ "misc:liteos_a_misc_unittest_door" ]
       }
-  if (LOSCFG_USER_TEST_TIME_CLOCK == true &&
-    (LOSCFG_USER_TEST_SMOKE == true || LOSCFG_USER_TEST_FULL == true)) {
-    deps += [ "time/clock:liteos_a_time_clock_unittest_door" ]
     }
-  if (LOSCFG_USER_TEST_SYS == true && LOSCFG_USER_TEST_SMOKE == true) {
-    deps += [ "sys:liteos_a_sys_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_SIGNAL == true && LOSCFG_USER_TEST_SMOKE == true) {
-    deps += [ "signal:liteos_a_signal_unittest_door" ]
+      if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+        deps += [ "drivers/hid:liteos_a_drivers_hid_unittest_door" ]
       }
-  if (LOSCFG_USER_TEST_SECURITY_REUGID == true && LOSCFG_USER_TEST_SMOKE == true) {
-    deps += [ "security/reugid:liteos_a_security_reugid_unittest_door" ]
     }
-  if (LOSCFG_USER_TEST_SECURITY_CAPABILITY == true && LOSCFG_USER_TEST_SMOKE == true) {
-    deps += [ "security/capability:liteos_a_security_capability_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_SECURITY_VID == true && LOSCFG_USER_TEST_SMOKE == true) {
-    deps += [ "security/vid:liteos_a_security_vid_unittest_door" ]
     }
-  if (LOSCFG_USER_TEST_MUTEX == true && LOSCFG_USER_TEST_SMOKE == true) {
+    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 && LOSCFG_USER_TEST_SMOKE == true) {
+    }
+    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 && LOSCFG_USER_TEST_SMOKE == true) {
+    }
+    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 && LOSCFG_USER_TEST_SMOKE == true) {
+    }
+    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 && LOSCFG_USER_TEST_SMOKE == true) {
+    }
+    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_POSIX_MEM == true && LOSCFG_USER_TEST_SMOKE == true) {
-    deps += [ "posix/mem:liteos_a_posix_mem_unittest_door" ]
     }
-  if (LOSCFG_USER_TEST_POSIX_MQUEUE == true &&
-    (LOSCFG_USER_TEST_SMOKE == true || LOSCFG_USER_TEST_FULL == true)) {
-    deps += [ "posix/mqueue:liteos_a_posix_mqueue_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_POSIX_PTHREAD == true &&
-    (LOSCFG_USER_TEST_SMOKE == true || LOSCFG_USER_TEST_FULL == true)) {
-    deps += [ "posix/pthread:liteos_a_posix_pthread_unittest_door" ]
+      if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+        deps += [ "security/reugid:liteos_a_security_reugid_unittest_door" ]
       }
-  if (LOSCFG_USER_TEST_MISC == true &&
-    (LOSCFG_USER_TEST_SMOKE == true || LOSCFG_USER_TEST_FULL == true)) {
-    deps += [ "misc:liteos_a_misc_unittest_door" ]
     }
-  if (LOSCFG_USER_TEST_MEM_SHM == true && LOSCFG_USER_TEST_SMOKE == true) {
-    deps += [ "mem/shm:liteos_a_mem_shm_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_MEM_VM == true && LOSCFG_USER_TEST_SMOKE == true) {
-    deps += [ "mem/vm:liteos_a_mem_vm_unittest_door" ]
+      if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+        deps += [ "security/capability:liteos_a_security_capability_unittest_door" ]
       }
-  if (LOSCFG_USER_TEST_IO == true && LOSCFG_USER_TEST_FULL == true) {
-    deps += [ "IO:liteos_a_io_unittest_door" ]
     }
-  if (LOSCFG_USER_TEST_EXC == true && LOSCFG_USER_TEST_FULL == true) {
-    deps += [ "exc:liteos_a_exc_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_DYNLOAD == true && LOSCFG_USER_TEST_SMOKE == true) {
-    deps += [ "dynload:liteos_a_dynload_unittest_door" ]
+      if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+        deps += [ "security/vid:liteos_a_security_vid_unittest_door" ]
       }
-  if (LOSCFG_USER_TEST_DRIVERS_HID == true && LOSCFG_USER_TEST_SMOKE == true) {
-    deps += [ "drivers/hid:liteos_a_drivers_hid_unittest_door" ]
     }
-  if (LOSCFG_USER_TEST_DRIVERS_STORAGE == true && LOSCFG_USER_TEST_SMOKE == true) {
-    deps += [ "drivers/storage:liteos_a_drivers_storage_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_NET_NETDB == true && LOSCFG_USER_TEST_FULL == true) {
-    deps += [ "net/netdb:liteos_a_net_netdb_unittest_door" ]
+      if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+        deps += [ "util:liteos_a_util_unittest_door" ]
       }
-  if (LOSCFG_USER_TEST_NET_RESOLV == true && LOSCFG_USER_TEST_FULL == true) {
-    deps += [ "net/resolv:liteos_a_net_resolv_unittest_door" ]
     }
-  if (LOSCFG_USER_TEST_NET_SOCKET == true && LOSCFG_USER_TEST_SMOKE == true) {
-    deps += [ "net/socket:liteos_a_net_socket_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_IPC == true && LOSCFG_USER_TEST_FULL == true) {
-    deps += [ "IPC:liteos_a_ipc_unittest_door" ]
+      if (LOSCFG_USER_TEST_FOR_DOOR == true) {
+        deps += [ "time/timer:liteos_a_time_timer_unittest_door" ]
       }
-  if (LOSCFG_USER_TEST_LITEIPC == true && LOSCFG_USER_TEST_SMOKE == true) {
-    deps += [ "liteipc:liteos_a_liteipc_unittest_door" ]
     }
-  if (LOSCFG_USER_TEST_FS_JFFS == true &&
-    (LOSCFG_USER_TEST_SMOKE == true || LOSCFG_USER_TEST_FULL == true || LOSCFG_USER_TEST_PRESSURE == true)) {
-    deps += [ "fs:liteos_a_fs_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" ]
+      }
     }
-  if (LOSCFG_USER_TEST_FS_VFAT == true &&
-    (LOSCFG_USER_TEST_SMOKE == true || LOSCFG_USER_TEST_FULL == true || LOSCFG_USER_TEST_PRESSURE == true)) {
-    deps += [ "fs/vfat2:liteos_a_fs_vfat_unittest_door" ]
   }
 }

testsuites/unittest/IO/BUILD.gn

@@ -30,23 +30,30 @@
 import("//build/lite/config/test.gni")
 import("../config.gni")
 
-unittest("liteos_a_io_unittest_door") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
   "../common/include",
   "../IO",
-  ]
-  sources = [
+]
+
+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",
   ]
-  if (LOSCFG_USER_TEST_FULL == true) {
-    sources_full = [
-      "full/IO_test_005.cpp",
-      "full/IO_test_008.cpp",
-      "full/IO_test_010.cpp",
-      "full/IO_test_013.cpp",
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
+
+source_set("sources_other") {
+  sources = [
     "full/IO_test_confstr_001.cpp",
     "full/IO_test_dcgettext_001.cpp",
     "full/IO_test_dcgettext_002.cpp",
@@ -82,8 +89,31 @@ unittest("liteos_a_io_unittest_door") {
     "full/IO_test_strncasecmp_l_001.cpp",
     "full/IO_test_strncasecmp_l_002.cpp",
   ]
-    sources += sources_full
-  }
+  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" ]
+  }
 }
\ No newline at end of file

testsuites/unittest/IO/io_test.cpp

@@ -43,7 +43,7 @@ public:
     static void TearDownTestCase(void) {}
 };
 
-#if defined(LOSCFG_USER_TEST_FULL)
+#if defined(LOSCFG_USER_TEST_SMOKE)
 /* *
  * @tc.name: IT_TEST_IO_005
  * @tc.desc: function for IoTest
@@ -90,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

testsuites/unittest/IPC/BUILD.gn

@@ -30,24 +30,54 @@
 import("//build/lite/config/test.gni")
 import("../config.gni")
 
-unittest("liteos_a_ipc_unittest_door") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
   "../common/include",
   "../IPC",
-  ]
-  sources = [
+]
+
+sources_entry = [
   "../common/osTest.cpp",
   "ipc_test.cpp",
+]
+
+source_set("sources_smoke") {
+  sources = [
   ]
-  if (LOSCFG_USER_TEST_FULL == true) {
-    sources_full = [
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
+
+source_set("sources_other") {
+  sources = [
     "full/IPC_test_mkfifoat_001.cpp",
     "full/IPC_test_mkfifoat_002.cpp",
   ]
-    sources += sources_full
-  }
+  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/config.gni

@@ -27,19 +27,25 @@
 # 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 = true
 LOSCFG_USER_TEST_PRESSURE = false
-LOSCFG_USER_TEST_FULL = false
 
-LOSCFG_USER_TEST_DRIVERS_STORAGE = true
+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
@@ -56,10 +62,3 @@ LOSCFG_USER_TEST_SYS = true
 LOSCFG_USER_TEST_TIME_CLOCK = true 
 LOSCFG_USER_TEST_TIME_TIMER = true
 LOSCFG_USER_TEST_UTIL = true
\ No newline at end of file
-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 = false
-LOSCFG_USER_TEST_FS_VFAT = false

testsuites/unittest/drivers/hid/BUILD.gn

@@ -30,23 +30,53 @@
 import("//build/lite/config/test.gni")
 import("../../config.gni")
 
-unittest("liteos_a_drivers_hid_unittest_door") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
   "../../common/include",
   "../../drivers/hid",
-  ]
-  sources = [
+]
+
+sources_entry = [
   "../../common/osTest.cpp",
   "drivers_hid_test.cpp",
-  ]
-  if (LOSCFG_USER_TEST_SMOKE == true) {
-    sources_smoke = [
+]
+
+source_set("sources_smoke") {
+  sources = [
     "smoke/hid_test_001.cpp",
   ]
-    sources += sources_smoke
-  }
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
+
+source_set("sources_other") {
+  sources = [
+  ]
+  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_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" ]
+  }
 }
\ No newline at end of file

testsuites/unittest/drivers/storage/BUILD.gn

@@ -30,23 +30,53 @@
 import("//build/lite/config/test.gni")
 import("../../config.gni")
 
-unittest("liteos_a_drivers_storage_unittest_door") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
   "../../common/include",
   "../../drivers/storage",
-  ]
-  sources = [
+]
+
+sources_entry = [
   "../../common/osTest.cpp",
   "drivers_storage_test.cpp",
-  ]
-  if (LOSCFG_USER_TEST_SMOKE == true) {
-    sources_smoke = [
+]
+
+source_set("sources_smoke") {
+  sources = [
     "smoke/storage_test_001.cpp",
   ]
-    sources += sources_smoke
-  }
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
+
+source_set("sources_other") {
+  sources = [
+  ]
+  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_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" ]
+  }
 }
\ No newline at end of file

testsuites/unittest/dynload/BUILD.gn

@@ -30,24 +30,54 @@
 import("//build/lite/config/test.gni")
 import("../config.gni")
 
-unittest("liteos_a_dynload_unittest_door") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
   "../common/include",
   "../dynload",
-  ]
-  sources = [
+]
+
+sources_entry = [
   "../common/osTest.cpp",
   "dynload_test.cpp",
-  ]
-  if (LOSCFG_USER_TEST_SMOKE == true) {
-    sources_smoke = [
+]
+
+source_set("sources_smoke") {
+  sources = [
     "smoke/dynload_test_002.cpp",
     "smoke/dynload_test_004.cpp",
   ]
-    sources += sources_smoke
-  }
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
+
+source_set("sources_other") {
+  sources = [
+  ]
+  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_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" ]
+  }
 }
\ No newline at end of file

testsuites/unittest/exc/BUILD.gn

@@ -30,28 +30,58 @@
 import("//build/lite/config/test.gni")
 import("../config.gni")
 
-unittest("liteos_a_exc_unittest_door") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
   "../common/include",
   "../exc",
-  ]
-  sources = [
+]
+
+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",
   ]
-  if (LOSCFG_USER_TEST_FULL == true) {
-    sources_full = [
-      "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",
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
+
+source_set("sources_other") {
+  sources = [
     "full/it_test_fexecve_001.cpp",
   ]
-    sources += sources_full
-  }
+  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" ]
+  }
 }
\ No newline at end of file

testsuites/unittest/exc/exc_test.cpp

@@ -41,7 +41,7 @@ public:
     static void TearDownTestCase(void) {}
 };
 
-#if defined(LOSCFG_USER_TEST_FULL)
+#if defined(LOSCFG_USER_TEST_SMOKE)
 /* *
  * @tc.name: ItTestExc005
  * @tc.desc: function for ExcTest

testsuites/unittest/fs/BUILD.gn

@@ -30,20 +30,20 @@
 import("//build/lite/config/test.gni")
 import("../config.gni")
 
-unittest("liteos_a_fs_unittest_door") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
-    "//kernel/liteos_a/testsuites/unittest/common/include",
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
   "//kernel/liteos_a/testsuites/unittest/fs/vfs",
   "//kernel/liteos_a/testsuites/unittest/fs/jffs",
-  ]
-  sources = [
-    "//kernel/liteos_a/testsuites/unittest/common/osTest.cpp",
+  "../common/include",
+]
+
+sources_entry = [
+  "../common/osTest.cpp",
   "jffs/vfs_jffs_test.cpp",
-  ]
-  if (LOSCFG_USER_TEST_SMOKE == true) {
-    sources_smoke = [
+]
+
+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",
@@ -60,10 +60,13 @@ unittest("liteos_a_fs_unittest_door") {
     "jffs/smoke/It_vfs_jffs_535.cpp",
     "jffs/smoke/It_vfs_jffs_Dac_001.cpp",
   ]
-    sources += sources_smoke
-  }
-  if (LOSCFG_USER_TEST_PRESSURE == true) {
-    sources_pressure = [
+  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",
@@ -208,10 +211,13 @@ unittest("liteos_a_fs_unittest_door") {
       "jffs/pressure/It_vfs_jffs_multipthread_062.cpp",
       "jffs/pressure/It_vfs_jffs_multipthread_063.cpp",
     ]
-    sources += sources_pressure
+    include_dirs = common_include_dirs
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
-  if (LOSCFG_USER_TEST_FULL == true) {
-    sources_full = [
+}
+
+source_set("sources_other") {
+  sources = [
     "jffs/full/It_jffs_001.cpp",
     "jffs/full/It_jffs_002.cpp",
     "jffs/full/It_jffs_003.cpp",
@@ -785,8 +791,34 @@ unittest("liteos_a_fs_unittest_door") {
     "jffs/full/It_vfs_jffs_807.cpp",
     "jffs/full/It_vfs_jffs_808.cpp",
   ]
-    sources += sources_full
-  }
+  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" ]
+  }
 }
\ No newline at end of file

testsuites/unittest/fs/proc/BUILD.gn

@@ -30,19 +30,26 @@
 import("//build/lite/config/test.gni")
 import("../../config.gni")
 
-unittest("liteos_a_fs_procfs_unittest_door") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
-    "//kernel/liteos_a/test/unittest/common/include",
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
+  "../../common/include",
   "//kernel/liteos_a/test/unittest/fs/proc",
-  ]
-  sources = [
-    "//kernel/liteos_a/test/unittest/common/osTest.cpp",
+]
+
+sources_entry = [
+  "../../common/osTest.cpp",
   "It_vfs_proc.cpp",
+]
+
+source_set("sources_smoke") {
+  sources = [
   ]
-  if (LOSCFG_USER_TEST_FULL == true) {
-    sources_full = [
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
+
+source_set("sources_other") {
+  sources = [
     "full/It_vfs_proc_001.cpp",
     "full/It_vfs_proc_002.cpp",
     "full/It_vfs_proc_003.cpp",
@@ -50,9 +57,31 @@ unittest("liteos_a_fs_procfs_unittest_door") {
     "full/It_vfs_proc_005.cpp",
     "full/It_vfs_proc_006.cpp",
   ]
-    sources += sources_full
-  }
+  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" ]
+  }
 }
\ No newline at end of file

testsuites/unittest/fs/vfat2/BUILD.gn

@@ -30,20 +30,29 @@
 import("//build/lite/config/test.gni")
 import("../../config.gni")
 
-unittest("liteos_a_fs_vfat_unittest_door") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
-    "//kernel/liteos_a/testsuites/unittest/common/include",
+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 = [
-    "//kernel/liteos_a/testsuites/unittest/common/osTest.cpp",
+]
+
+sources_entry = [
+  "../../common/osTest.cpp",
   "VfsFatTest.cpp",
+]
+
+source_set("sources_smoke") {
+  sources = [
+    "smoke/It_vfs_fat_026.cpp",
   ]
-  if (LOSCFG_USER_TEST_PRESSURE == true) {
-    sources_pressure = [
+  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",
@@ -110,16 +119,13 @@ unittest("liteos_a_fs_vfat_unittest_door") {
       "pressure/It_vfs_fat_mutipthread_049.cpp",
       "pressure/It_vfs_fat_mutipthread_050.cpp",
     ]
-    sources += sources_pressure
-  }
-  if (LOSCFG_USER_TEST_SMOKE == true) {
-    sources_smoke = [
-      "smoke/It_vfs_fat_026.cpp",
-    ]
-    sources += sources_smoke
+    include_dirs = common_include_dirs
+    deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
   }
-  if (LOSCFG_USER_TEST_FULL == true) {
-    sources_full = [
+}
+
+source_set("sources_other") {
+  sources = [
     "full/It_vfs_fat_066.cpp",
     "full/It_vfs_fat_068.cpp",
     "full/It_vfs_fat_072.cpp",
@@ -187,8 +193,34 @@ unittest("liteos_a_fs_vfat_unittest_door") {
     "full/It_vfs_fat_904.cpp",
     "full/It_vfs_fat_909.cpp",
   ]
-    sources += sources_full
-  }
+  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" ]
+  }
 }
\ No newline at end of file

testsuites/unittest/liteipc/BUILD.gn

@@ -30,25 +30,55 @@
 import("//build/lite/config/test.gni")
 import("../config.gni")
 
-unittest("liteos_a_liteipc_unittest_door") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
   "../common/include",
   "../liteipc",
-  ]
-  sources = [
+]
+
+sources_entry = [
   "../common/osTest.cpp",
   "smgr_demo.cpp",
   "it_test_liteipc.cpp",
-  ]
-  if (LOSCFG_USER_TEST_SMOKE == true) {
-    sources_smoke = [
+]
+
+source_set("sources_smoke") {
+  sources = [
     "smoke/liteipc_test_001.cpp",
     "smoke/liteipc_test_002.cpp",
   ]
-    sources += sources_smoke
-  }
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
+
+source_set("sources_other") {
+  sources = [
+  ]
+  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_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

@@ -30,19 +30,19 @@
 import("//build/lite/config/test.gni")
 import("../../config.gni")
 
-unittest("liteos_a_mem_shm_unittest_door") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
   "../../common/include",
   "../../mem/shm",
-  ]
-  sources = [
+]
+
+sources_entry = [
   "../../common/osTest.cpp",
   "mem_shm_test.cpp",
-  ]
-  if (LOSCFG_USER_TEST_SMOKE == true) {
-    sources_smoke = [
+]
+
+source_set("sources_smoke") {
+  sources = [
       "smoke/shm_test_001.cpp",
       "smoke/shm_test_002.cpp",
       "smoke/shm_test_003.cpp",
@@ -58,8 +58,38 @@ unittest("liteos_a_mem_shm_unittest_door") {
       "smoke/shm_test_013.cpp",
       "smoke/shm_test_014.cpp",
   ]
-    sources += sources_smoke
-  }
-  configs = [ "../..:public_config" ]
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
+
+source_set("sources_other") {
+  sources = [
+  ]
+  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/vm/BUILD.gn

@@ -30,19 +30,19 @@
 import("//build/lite/config/test.gni")
 import("../../config.gni")
 
-unittest("liteos_a_mem_vm_unittest_door") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
   "../../common/include",
   "../../mem/vm",
-  ]
-  sources = [
+]
+
+sources_entry = [
   "../../common/osTest.cpp",
   "mem_vm_test.cpp",
-  ]
-  if (LOSCFG_USER_TEST_SMOKE == true) {
-    sources_smoke = [
+]
+
+source_set("sources_smoke") {
+  sources = [
     "smoke/mmap_test_001.cpp",
     "smoke/mmap_test_002.cpp",
     "smoke/mmap_test_003.cpp",
@@ -59,8 +59,38 @@ unittest("liteos_a_mem_vm_unittest_door") {
     "smoke/open_wmemstream_test_001.cpp",
     "smoke/user_copy_test_001.cpp",
   ]
-    sources += sources_smoke
-  }
-  configs = [ "../..:public_config" ]
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
+
+source_set("sources_other") {
+  sources = [
+  ]
+  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/misc/BUILD.gn

@@ -30,21 +30,19 @@
 import("//build/lite/config/test.gni")
 import("../config.gni")
 
-unittest("liteos_a_misc_unittest_door") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
   "../common/include",
   "../misc",
-  ]
+]
 
-  sources = [
+sources_entry = [
   "../common/osTest.cpp",
   "misc_test.cpp",
-  ]
+]
 
-  if (LOSCFG_USER_TEST_FULL == true) {
-    sources_full = [
+source_set("sources_other") {
+  sources = [
     "full/misc_test_006.cpp",
     "full/misc_test_007.cpp",
     "full/misc_test_010.cpp",
@@ -52,10 +50,12 @@ unittest("liteos_a_misc_unittest_door") {
     "full/misc_test_012.cpp",
     "full/misc_test_013.cpp",
   ]
-    sources += sources_full
-  }
-  if (LOSCFG_USER_TEST_SMOKE == true) {
-    sources_smoke = [
+  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",
@@ -65,9 +65,31 @@ unittest("liteos_a_misc_unittest_door") {
     "smoke/misc_test_009.cpp",
     "smoke/misc_test_014.cpp",
   ]
-    sources += sources_smoke
+  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" ]
   }
+}
 
-  configs = [ "..:public_config" ]
-  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+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" ]
+  }
 }
\ No newline at end of file

testsuites/unittest/net/netdb/BUILD.gn

@@ -37,20 +37,28 @@ config("net_local_config") {
   }
 }
 
-unittest("liteos_a_net_netdb_unittest_door") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
   "../../common/include",
   "./",
-  ]
-  sources = [
+]
+
+sources_entry = [
     "../../common/osTest.cpp",
     "net_netdb_test.cpp",
+]
+
+source_set("sources_smoke") {
+  sources = [
+    "smoke/net_netdb_test_001.cpp",
+    "smoke/net_netdb_test_013.cpp",
   ]
-  if (LOSCFG_USER_TEST_FULL == true) {
-    sources_full = [
-      "full/net_netdb_test_001.cpp",
+  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",
@@ -62,7 +70,6 @@ unittest("liteos_a_net_netdb_unittest_door") {
     "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",
@@ -73,10 +80,31 @@ unittest("liteos_a_net_netdb_unittest_door") {
     "full/net_netdb_test_021.cpp",
     "full/net_netdb_test_022.cpp",
   ]
-    sources += sources_full
+  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" ]
   }
-  configs = [
-    "../..:public_config",
-    ":net_local_config",
-  ]
 }
\ No newline at end of file

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,32 +37,62 @@ config("net_local_config") {
   }
 }
 
-unittest("liteos_a_net_resolv_unittest_door") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
   "../../common/include",
   "./",
-  ]
-  sources = [
+]
+
+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",
   ]
-  if (LOSCFG_USER_TEST_FULL == true) {
-    sources_full = [
-      "full/net_resolv_test_001.cpp",
-      "full/net_resolv_test_002.cpp",
-      "full/net_resolv_test_003.cpp",
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
+
+source_set("sources_other") {
+  sources = [
     "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",
   ]
-    sources += sources_full
+  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" ]
   }
-  configs = [
-    "../..:public_config",
-    ":net_local_config",
-  ]
 }
\ No newline at end of file

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,19 +37,19 @@ config("net_local_config") {
   }
 }
 
-unittest("liteos_a_net_socket_unittest_door") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
   "../../common/include",
-    "../../net/socket",
-  ]
-  sources = [
+  "./",
+]
+
+sources_entry = [
   "../../common/osTest.cpp",
   "net_socket_test.cpp",
-  ]
-  if (LOSCFG_USER_TEST_SMOKE == true) {
-    sources_smoke = [
+]
+
+source_set("sources_smoke") {
+  sources = [
     "smoke/net_socket_test_001.cpp",
     "smoke/net_socket_test_002.cpp",
     "smoke/net_socket_test_003.cpp",
@@ -64,11 +64,40 @@ unittest("liteos_a_net_socket_unittest_door") {
     "smoke/net_socket_test_012.cpp",
     "smoke/net_socket_test_013.cpp",
   ]
-    sources += sources_smoke
-  }
+  include_dirs = common_include_dirs
   deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
-  configs = [
-    "../../:public_config",
-    ":net_local_config",
+}
+
+source_set("sources_other") {
+  sources = [
   ]
+  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" ]
+  }
 }
\ No newline at end of file

testsuites/unittest/posix/mem/BUILD.gn

@@ -30,26 +30,54 @@
 import("//build/lite/config/test.gni")
 import("../../config.gni")
 
-unittest("liteos_a_posix_mem_unittest_door") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
   "../../common/include",
-    "../../posix/mem",
-  ]
-  sources = [
+  "./",
+]
+
+sources_entry = [
   "../../common/osTest.cpp",
   "posix_mem_test.cpp",
-  ]
+]
 
-  if (LOSCFG_USER_TEST_SMOKE == true) {
-    sources_smoke = [
+source_set("sources_smoke") {
+  sources = [
     "smoke/It_posix_mem_001.cpp",
     "smoke/It_posix_mem_003.cpp",
   ]
-    sources += sources_smoke
-  }
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
 
+source_set("sources_other") {
+  sources = [
+  ]
+  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_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" ]
+  }
 }
\ No newline at end of file

testsuites/unittest/posix/mqueue/BUILD.gn

@@ -35,20 +35,37 @@ config("mqueue_config") {
   cflags_cc = cflags
 }
 
-unittest("liteos_a_posix_mqueue_unittest_door") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
   "../../common/include",
-    "../../posix/mqueue",
-  ]
-  sources = [
+  "./",
+]
+
+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",
   ]
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
 
-  if (LOSCFG_USER_TEST_FULL == true) {
-    sources_full = [
+source_set("sources_other") {
+  sources = [
     "full/It_posix_queue_002.cpp",
     "full/It_posix_queue_005.cpp",
     "full/It_posix_queue_008.cpp",
@@ -189,26 +206,33 @@ unittest("liteos_a_posix_mqueue_unittest_door") {
     "full/It_posix_queue_203.cpp",
     "full/It_posix_queue_204.cpp",
   ]
-    sources += sources_full
-  }
-  if (LOSCFG_USER_TEST_SMOKE == true) {
-    sources_smoke = [
-      "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",
-    ]
-    sources += sources_smoke
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
+
+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" ]
   }
+}
 
-  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
-  configs = [ "../..:public_config" ]
+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" ]
+  }
 }
\ No newline at end of file

testsuites/unittest/posix/pthread/BUILD.gn

@@ -35,19 +35,19 @@ config("pthread_config") {
   cflags_cc = cflags
 }
 
-unittest("liteos_a_posix_pthread_unittest_door") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
   "../../common/include",
-    "../../posix/pthread",
-  ]
-  sources = [
+  "./",
+]
+
+sources_entry = [
   "../../common/osTest.cpp",
   "posix_pthread_test.cpp",
-  ]
-  if (LOSCFG_USER_TEST_SMOKE == true) {
-    sources_smoke = [
+]
+
+source_set("sources_smoke") {
+  sources = [
     "smoke/It_posix_pthread_003.cpp",
     "smoke/It_posix_pthread_004.cpp",
     "smoke/It_posix_pthread_005.cpp",
@@ -59,10 +59,12 @@ unittest("liteos_a_posix_pthread_unittest_door") {
     "smoke/It_posix_pthread_022.cpp",
     "smoke/It_posix_pthread_203.cpp",
   ]
-    sources += sources_smoke
-  }
-  if (LOSCFG_USER_TEST_FULL == true) {
-    sources_full = [
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
+
+source_set("sources_other") {
+  sources = [
     "full/It_posix_pthread_001.cpp",
     "full/It_posix_pthread_002.cpp",
     "full/It_posix_pthread_007.cpp",
@@ -169,9 +171,33 @@ unittest("liteos_a_posix_pthread_unittest_door") {
     "full/It_posix_pthread_240.cpp",
     "full/It_posix_pthread_241.cpp",
   ]
-    sources += sources_full
-  }
+  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_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" ]
+  }
 }
\ No newline at end of file

testsuites/unittest/process/mutex/BUILD.gn

@@ -30,19 +30,19 @@
 import("//build/lite/config/test.gni")
 import("../../config.gni")
 
-unittest("liteos_a_mutex_unittest_door") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
   "../../common/include",
-    "../../process/mutex",
-  ]
-  sources = [
+  "./",
+]
+
+sources_entry = [
   "../../common/osTest.cpp",
   "process_mutex_test.cpp",
-  ]
-  if (LOSCFG_USER_TEST_SMOKE == true) {
-    sources_smoke = [
+]
+
+source_set("sources_smoke") {
+  sources = [
     "smoke/pthread_mutex_test_001.cpp",
     "smoke/pthread_mutex_test_002.cpp",
     "smoke/pthread_mutex_test_003.cpp",
@@ -69,8 +69,38 @@ unittest("liteos_a_mutex_unittest_door") {
     "smoke/pthread_mutex_test_024.cpp",
     "smoke/pthread_mutex_test_025.cpp",
   ]
-    sources += sources_smoke
-  }
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
+
+source_set("sources_other") {
+  sources = [
+  ]
+  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_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" ]
+  }
 }
\ No newline at end of file

testsuites/unittest/process/process/BUILD.gn

@@ -30,19 +30,19 @@
 import("//build/lite/config/test.gni")
 import("../../config.gni")
 
-unittest("liteos_a_process_unittest_door") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
   "../../common/include",
-    "../../process/process",
-  ]
-  sources = [
+  "./",
+]
+
+sources_entry = [
   "../../common/osTest.cpp",
   "process_process_test.cpp",
-  ]
-  if (LOSCFG_USER_TEST_SMOKE == true) {
-    sources_smoke = [
+]
+
+source_set("sources_smoke") {
+  sources = [
     "smoke/process_test_001.cpp",
     "smoke/process_test_002.cpp",
     "smoke/process_test_004.cpp",
@@ -118,8 +118,38 @@ unittest("liteos_a_process_unittest_door") {
     "smp/process_test_smp_007.cpp",
     "smp/process_test_smp_008.cpp",
   ]
-    sources += sources_smoke
-  }
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
+
+source_set("sources_other") {
+  sources = [
+  ]
+  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_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" ]
+  }
 }
\ No newline at end of file

testsuites/unittest/process/pthread/BUILD.gn

@@ -30,19 +30,19 @@
 import("//build/lite/config/test.gni")
 import("../../config.gni")
 
-unittest("liteos_a_pthread_unittest_door") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
   "../../common/include",
-    "../../process/pthread",
-  ]
-  sources = [
+  "./",
+]
+
+sources_entry = [
   "../../common/osTest.cpp",
   "process_pthread_test.cpp",
-  ]
-  if (LOSCFG_USER_TEST_SMOKE == true) {
-    sources_smoke = [
+]
+
+source_set("sources_smoke") {
+  sources = [
     "smoke/pthread_atfork_test_001.cpp",
     "smoke/pthread_atfork_test_002.cpp",
     "smoke/pthread_cond_test_001.cpp",
@@ -68,8 +68,38 @@ unittest("liteos_a_pthread_unittest_door") {
     "smoke/pthread_test_018.cpp",
     "smoke/pthread_test_019.cpp",
   ]
-    sources += sources_smoke
-  }
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
+
+source_set("sources_other") {
+  sources = [
+  ]
+  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_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" ]
+  }
 }
\ No newline at end of file

testsuites/unittest/process/rwlock/BUILD.gn

@@ -30,24 +30,54 @@
 import("//build/lite/config/test.gni")
 import("../../config.gni")
 
-unittest("liteos_a_rwlock_unittest_door") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
   "../../common/include",
-    "../../process/rwlock",
-  ]
-  sources = [
+  "./",
+]
+
+sources_entry = [
   "../../common/osTest.cpp",
   "process_rwlock_test.cpp",
-  ]
-  if (LOSCFG_USER_TEST_SMOKE == true) {
-    sources_smoke = [
+]
+
+source_set("sources_smoke") {
+  sources = [
     "smoke/pthread_rwlock_test_001.cpp",
     "smoke/pthread_rwlock_test_002.cpp",
   ]
-    sources += sources_smoke
-  }
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
+
+source_set("sources_other") {
+  sources = [
+  ]
+  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_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" ]
+  }
 }
\ No newline at end of file

testsuites/unittest/process/spinlock/BUILD.gn

@@ -30,23 +30,53 @@
 import("//build/lite/config/test.gni")
 import("../../config.gni")
 
-unittest("liteos_a_spinlock_unittest_door") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
   "../../common/include",
-    "../../process/spinlock",
-  ]
-  sources = [
+  "./",
+]
+
+sources_entry = [
   "../../common/osTest.cpp",
   "process_spinlock_test.cpp",
-  ]
-  if (LOSCFG_USER_TEST_SMOKE == true) {
-    sources_smoke = [
+]
+
+source_set("sources_smoke") {
+  sources = [
     "smoke/pthread_spinlock_test_001.cpp",
   ]
-    sources += sources_smoke
-  }
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
+
+source_set("sources_other") {
+  sources = [
+  ]
+  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_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" ]
+  }
 }
\ No newline at end of file

testsuites/unittest/security/capability/BUILD.gn

@@ -2,24 +2,53 @@
 import("//build/lite/config/test.gni")
 import("../../config.gni")
 
-unittest("liteos_a_security_capability_unittest_door") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
   "../../common/include",
-    "../../security/capability",
-    "//third_party/bounds_checking_function/include",
-  ]
-  sources = [
+  "./",
+]
+
+sources_entry = [
   "../../common/osTest.cpp",
   "security_capability_test.cpp",
-  ]
-  if (LOSCFG_USER_TEST_SMOKE == true) {
-    sources_smoke = [
+]
+
+source_set("sources_smoke") {
+  sources = [
     "smoke/cap_test_001.cpp",
   ]
-    sources += sources_smoke
-  }
-  configs = [ "../..:public_config" ]
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
+
+source_set("sources_other") {
+  sources = [
+  ]
+  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" ]
+  }
+}
\ No newline at end of file

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

@@ -30,23 +30,53 @@
 import("//build/lite/config/test.gni")
 import("../../config.gni")
 
-unittest("liteos_a_security_reugid_unittest_door") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
   "../../common/include",
-    "../../security/reugid",
-  ]
-  sources = [
+  "./",
+]
+
+sources_entry = [
   "../../common/osTest.cpp",
   "security_reugid_test.cpp",
-  ]
-  if (LOSCFG_USER_TEST_SMOKE == true) {
-    sources_smoke = [
+]
+
+source_set("sources_smoke") {
+  sources = [
     "smoke/reugid_test_001.cpp",
   ]
-    sources += sources_smoke
-  }
-  configs = [ "../..:public_config" ]
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
+
+source_set("sources_other") {
+  sources = [
+  ]
+  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" ]
+  }
+}
\ No newline at end of file

testsuites/unittest/security/vid/BUILD.gn

@@ -30,23 +30,53 @@
 import("//build/lite/config/test.gni")
 import("../../config.gni")
 
-unittest("liteos_a_security_vid_unittest_door") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
   "../../common/include",
-    "../../security/vid",
-  ]
-  sources = [
+  "./",
+]
+
+sources_entry = [
   "../../common/osTest.cpp",
   "security_vid_test.cpp",
-  ]
-  if (LOSCFG_USER_TEST_SMOKE == true) {
-    sources_smoke = [
+]
+
+source_set("sources_smoke") {
+  sources = [
     "smoke/vid_test_001.cpp",
   ]
-    sources += sources_smoke
-  }
-  configs = [ "../..:public_config" ]
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
+
+source_set("sources_other") {
+  sources = [
+  ]
+  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" ]
+  }
+}
\ No newline at end of file

testsuites/unittest/signal/BUILD.gn

@@ -30,19 +30,19 @@
 import("//build/lite/config/test.gni")
 import("../config.gni")
 
-unittest("liteos_a_signal_unittest_door") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
   "../common/include",
-    "../signal",
-  ]
-  sources = [
+  "./",
+]
+
+sources_entry = [
   "../common/osTest.cpp",
   "signal_test.cpp",
-  ]
-  if (LOSCFG_USER_TEST_SMOKE == true) {
-    sources_smoke = [
+]
+
+source_set("sources_smoke") {
+  sources = [
     "smoke/It_ipc_fdclr_001.cpp",
     "smoke/It_ipc_fdisset_001.cpp",
     "smoke/It_ipc_fdset_001.cpp",
@@ -107,8 +107,38 @@ unittest("liteos_a_signal_unittest_door") {
     "smoke/sigset_test_001.cpp",
     "smoke/sigset_test_002.cpp",
   ]
-    sources += sources_smoke
-  }
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
+
+source_set("sources_other") {
+  sources = [
+  ]
+  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_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" ]
+  }
 }
\ No newline at end of file

testsuites/unittest/sys/BUILD.gn

@@ -30,20 +30,19 @@
 import("//build/lite/config/test.gni")
 import("../config.gni")
 
-unittest("liteos_a_sys_unittest_door") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
   "../common/include",
-    "../sys",
-  ]
-  sources = [
+  "./",
+]
+
+sources_entry = [
   "../common/osTest.cpp",
   "sys_unit_test.cpp",
-  ]
+]
 
-  if (LOSCFG_USER_TEST_SMOKE == true) {
-    sources_smoke = [
+source_set("sources_smoke") {
+  sources = [
     "smoke/sys_test_001.cpp",
     "smoke/sys_test_004.cpp",
     "smoke/sys_test_005.cpp",
@@ -73,9 +72,38 @@ unittest("liteos_a_sys_unittest_door") {
     "smoke/sys_test_030.cpp",
     "smoke/sys_test_031.cpp",
   ]
-    sources += sources_smoke
-  }
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
 
+source_set("sources_other") {
+  sources = [
+  ]
+  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_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" ]
+  }
 }
\ No newline at end of file

testsuites/unittest/time/clock/BUILD.gn

@@ -30,21 +30,19 @@
 import("//build/lite/config/test.gni")
 import("../../config.gni")
 
-unittest("liteos_a_time_clock_unittest_door") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
   "../../common/include",
-    "../../time/clock",
-  ]
+  "./",
+]
 
-  sources = [
+sources_entry = [
   "../../common/osTest.cpp",
   "time_clock_test.cpp",
-  ]
+]
 
-  if (LOSCFG_USER_TEST_SMOKE == true) {
-    sources_smoke = [
+source_set("sources_smoke") {
+  sources = [
     "smoke/clock_test_001.cpp",
     "smoke/clock_test_002.cpp",
     "smoke/clock_test_003.cpp",
@@ -56,15 +54,39 @@ unittest("liteos_a_time_clock_unittest_door") {
     "smoke/clock_test_011.cpp",
     "smoke/clock_test_012.cpp",
   ]
-    sources += sources_smoke
-  }
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
 
-  if (LOSCFG_USER_TEST_FULL == true) {
-    sources_full = [
+source_set("sources_other") {
+  sources = [
     "full/clock_test_010.cpp",
   ]
-    sources += sources_full
-  }
+  include_dirs = common_include_dirs
   deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
-  configs = [ "../../../unittest:public_config" ]
+}
+
+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" ]
+  }
 }
\ No newline at end of file

testsuites/unittest/time/timer/BUILD.gn

@@ -30,21 +30,19 @@
 import("//build/lite/config/test.gni")
 import("../../config.gni")
 
-unittest("liteos_a_time_timer_unittest_door") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
   "../../common/include",
-    "../../time/timer",
-  ]
+  "./",
+]
 
-  sources = [
+sources_entry = [
   "../../common/osTest.cpp",
   "time_timer_test.cpp",
-  ]
+]
 
-  if (LOSCFG_USER_TEST_SMOKE == true) {
-    sources_smoke = [
+source_set("sources_smoke") {
+  sources = [
     "smoke/timer_test_001.cpp",
     "smoke/timer_test_002.cpp",
     "smoke/timer_test_003.cpp",
@@ -52,9 +50,38 @@ unittest("liteos_a_time_timer_unittest_door") {
     "smoke/timer_test_tzset_001.cpp",
     "smoke/timer_test_tzset_002.cpp",
   ]
-    sources += sources_smoke
-  }
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
 
+source_set("sources_other") {
+  sources = [
+  ]
+  include_dirs = common_include_dirs
   deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
-  configs = [ "../../../unittest:public_config" ]
+}
+
+if (LOSCFG_USER_TEST_FOR_ALL == true) {
+  unittest("liteos_a_time_timer_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_timer_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" ]
+  }
 }
\ No newline at end of file

testsuites/unittest/util/BUILD.gn

@@ -30,22 +30,21 @@
 import("//build/lite/config/test.gni")
 import("../config.gni")
 
-unittest("liteos_a_util_unittest_door") {
-  output_extension = "bin"
-  output_dir = "$root_out_dir/test/unittest/kernel"
-  include_dirs = [
+
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
   "../common/include",
-    "./",
   "../misc",
-  ]
+  "./",
+]
 
-  sources = [
+sources_entry = [
   "../common/osTest.cpp",
   "util_test.cpp",
-  ]
+]
 
-  if (LOSCFG_USER_TEST_SMOKE == true) {
-    sources_smoke = [
+source_set("sources_smoke") {
+  sources = [
       "smoke/it_test_util_100.cpp",
       "smoke/it_test_util_101.cpp",
       "smoke/util_test_001.cpp",
@@ -56,9 +55,38 @@ unittest("liteos_a_util_unittest_door") {
       "smoke/util_test_006.cpp",
       "smoke/util_test_007.cpp",
   ]
-    sources += sources_smoke
-  }
+  include_dirs = common_include_dirs
+  deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
+}
 
+source_set("sources_other") {
+  sources = [
+  ]
+  include_dirs = common_include_dirs
   deps = [ "//third_party/bounds_checking_function:libsec_shared" ]
-  configs = [ "../../unittest:public_config" ]
+}
+
+if (LOSCFG_USER_TEST_FOR_ALL == true) {
+  unittest("liteos_a_util_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_util_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" ]
+  }
 }
\ No newline at end of file