refactor: 删除旧测试套,拆分process用例适配门禁90s规则

close: #I4RE80
Signed-off-by: arvinzzz <zhaotianyu9@huawei.com>

Change-Id: I353fe4aa10e4f03e7cbaca572c8e73289c599c29

testsuites/BUILD.gn

@@ -33,6 +33,5 @@ group("testsuites") {
   deps = [
     #"kernel",
     "unittest",
-    "unittest_old",
   ]
 }

testsuites/unittest/BUILD.gn

@@ -63,6 +63,7 @@ config("public_config_for_pressure") {
   cflags_cc = cflags
 }
 
+# Note: The execution time of a single XXX_door.bin cannot exceed 90 seconds.
 group("unittest") {
   deps = []
   if (ohos_build_type == "debug") {
@@ -129,6 +130,18 @@ group("unittest") {
       }
     }
 
+    # process test
+    if (LOSCFG_USER_TEST_PROCESS_THREAD == true) {
+      if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
+        deps += [ "process/basic:liteos_a_process_basic_unittest_door" ]
+        deps += [ "process/lock:liteos_a_process_lock_unittest_door" ]
+      }
+      if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
+        deps += [ "process/basic:liteos_a_process_basic_unittest" ]
+        deps += [ "process/lock:liteos_a_process_lock_unittest" ]
+      }
+    }
+
     # security test
     if (LOSCFG_USER_TEST_SECURITY == true) {
       if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {

testsuites/unittest/basic/config.gni

@@ -74,44 +74,3 @@ if (LOSCFG_USER_TEST_MEM_VM == true) {
   sources_smoke += mem_vm_sources_smoke
   sources_full += mem_vm_sources_full
 }
-
-# process module
-if (LOSCFG_USER_TEST_MUTEX == true) {
-  import("./process/mutex/config.gni")
-  common_include_dirs += mutex_include_dirs
-  sources_entry += mutex_sources_entry
-  sources_smoke += mutex_sources_smoke
-  sources_full += mutex_sources_full
-}
-
-if (LOSCFG_USER_TEST_PROCESS == true) {
-  import("./process/process/config.gni")
-  common_include_dirs += process_include_dirs
-  sources_entry += process_sources_entry
-  sources_smoke += process_sources_smoke
-  sources_full += process_sources_full
-}
-
-if (LOSCFG_USER_TEST_PTHREAD == true) {
-  import("./process/pthread/config.gni")
-  common_include_dirs += pthread_include_dirs
-  sources_entry += pthread_sources_entry
-  sources_smoke += pthread_sources_smoke
-  sources_full += pthread_sources_full
-}
-
-if (LOSCFG_USER_TEST_RWLOCK == true) {
-  import("./process/rwlock/config.gni")
-  common_include_dirs += rwlock_include_dirs
-  sources_entry += rwlock_sources_entry
-  sources_smoke += rwlock_sources_smoke
-  sources_full += rwlock_sources_full
-}
-
-if (LOSCFG_USER_TEST_SPINLOCK == true) {
-  import("./process/spinlock/config.gni")
-  common_include_dirs += spinlock_include_dirs
-  sources_entry += spinlock_sources_entry
-  sources_smoke += spinlock_sources_smoke
-  sources_full += spinlock_sources_full
-}

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

@@ -1,65 +0,0 @@
-# Copyright (c) 2022-2022 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/testsuites/unittest/config.gni")
-
-mutex_include_dirs = [ "$TEST_UNITTEST_DIR/basic/process/mutex" ]
-
-mutex_sources_entry =
-    [ "$TEST_UNITTEST_DIR/basic/process/mutex/process_mutex_test.cpp" ]
-
-mutex_sources_smoke = [
-  "$TEST_UNITTEST_DIR/basic/process/mutex/smoke/pthread_mutex_test_001.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/mutex/smoke/pthread_mutex_test_002.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/mutex/smoke/pthread_mutex_test_003.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/mutex/smoke/pthread_mutex_test_004.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/mutex/smoke/pthread_mutex_test_005.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/mutex/smoke/pthread_mutex_test_006.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/mutex/smoke/pthread_mutex_test_007.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/mutex/smoke/pthread_mutex_test_008.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/mutex/smoke/pthread_mutex_test_009.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/mutex/smoke/pthread_mutex_test_010.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/mutex/smoke/pthread_mutex_test_011.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/mutex/smoke/pthread_mutex_test_012.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/mutex/smoke/pthread_mutex_test_013.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/mutex/smoke/pthread_mutex_test_014.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/mutex/smoke/pthread_mutex_test_015.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/mutex/smoke/pthread_mutex_test_016.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/mutex/smoke/pthread_mutex_test_017.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/mutex/smoke/pthread_mutex_test_019.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/mutex/smoke/pthread_mutex_test_020.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/mutex/smoke/pthread_mutex_test_021.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/mutex/smoke/pthread_mutex_test_022.cpp",
-]
-
-mutex_sources_full = [
-  "$TEST_UNITTEST_DIR/basic/process/mutex/full/pthread_mutex_test_018.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/mutex/full/pthread_mutex_test_023.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/mutex/full/pthread_mutex_test_024.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/mutex/full/pthread_mutex_test_025.cpp",
-]

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

@@ -1,114 +0,0 @@
-# Copyright (c) 2022-2022 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/testsuites/unittest/config.gni")
-
-process_include_dirs = [ "$TEST_UNITTEST_DIR/basic/process/process" ]
-
-process_sources_entry =
-    [ "$TEST_UNITTEST_DIR/basic/process/process/process_process_test.cpp" ]
-
-process_sources_smoke = [
-  "$TEST_UNITTEST_DIR/basic/process/process/smoke/process_test_001.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/smoke/process_test_002.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/smoke/process_test_004.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/smoke/process_test_005.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/smoke/process_test_006.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/smoke/process_test_008.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/smoke/process_test_009.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/smoke/process_test_010.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/smoke/process_test_011.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/smoke/process_test_012.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/smoke/process_test_013.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/smoke/process_test_014.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/smoke/process_test_015.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/smoke/process_test_016.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/smoke/process_test_017.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/smoke/process_test_018.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/smoke/process_test_019.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/smoke/process_test_020.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/smoke/process_test_021.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/smoke/process_test_022.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/smoke/process_test_023.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/smoke/process_test_024.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/smoke/process_test_025.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/smoke/process_test_026.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/smoke/process_test_027.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/smoke/process_test_029.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/smoke/process_test_030.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/smoke/process_test_038.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/smoke/process_test_039.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/smoke/process_test_043.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/smoke/process_test_044.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/smoke/process_test_045.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/smoke/process_test_046.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/smoke/process_test_047.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/smoke/process_test_048.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/smoke/process_test_054.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/smoke/process_test_061.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/smp/process_test_smp_001.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/smp/process_test_smp_002.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/smp/process_test_smp_003.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/smp/process_test_smp_004.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/smp/process_test_smp_005.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/smp/process_test_smp_006.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/smp/process_test_smp_007.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/smp/process_test_smp_008.cpp",
-]
-
-process_sources_full = [
-  "$TEST_UNITTEST_DIR/basic/process/process/full/process_test_007.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/full/process_test_031.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/full/process_test_032.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/full/process_test_033.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/full/process_test_034.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/full/process_test_035.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/full/process_test_036.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/full/process_test_037.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/full/process_test_040.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/full/process_test_041.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/full/process_test_042.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/full/process_test_049.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/full/process_test_050.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/full/process_test_051.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/full/process_test_055.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/full/process_test_056.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/full/process_test_057.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/full/process_test_058.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/full/process_test_059.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/full/process_test_060.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/full/process_test_063.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/full/process_test_064.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/full/process_test_065.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/full/process_test_066.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/full/process_test_067.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/full/process_test_068.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/full/process_test_069.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/full/process_test_053.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/process/full/process_test_062.cpp",
-]

testsuites/unittest/config.gni

@@ -53,6 +53,12 @@ LOSCFG_USER_TEST_DYNLOAD = true
 LOSCFG_USER_TEST_EXC = true
 LOSCFG_USER_TEST_MEM_SHM = true
 LOSCFG_USER_TEST_MEM_VM = true
+
+########## process test ##########
+# Control switch for process&pthread function test
+LOSCFG_USER_TEST_PROCESS_THREAD = true
+
+# Module list
 LOSCFG_USER_TEST_MUTEX = true
 LOSCFG_USER_TEST_PROCESS = true
 LOSCFG_USER_TEST_PTHREAD = true

testsuites/unittest/process/basic/BUILD.gn

@@ -1,5 +1,4 @@
-# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
-# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+# Copyright (c) 2022-2022 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:
@@ -28,25 +27,11 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//build/lite/config/test.gni")
-import("../../config.gni")
-
-common_include_dirs = [
-  "//third_party/googletest/googletest/include",
-  "../../common/include",
-  "./",
-]
-
-sources_entry = [
-  "../../common/osTest.cpp",
-  "security_vid_test.cpp",
-]
-
-sources_smoke = [ "smoke/vid_test_001.cpp" ]
-
-sources_full = []
+import("//kernel/liteos_a/testsuites/unittest/config.gni")
+import("./config.gni")
 
 if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
-  unittest("liteos_a_security_vid_unittest_door") {
+  unittest("liteos_a_process_basic_unittest_door") {
     output_extension = "bin"
     output_dir = "$root_out_dir/test/unittest/kernel"
     include_dirs = common_include_dirs
@@ -60,7 +45,7 @@ if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_LOW) {
 }
 
 if (LOSCFG_USER_TEST_LEVEL >= TEST_LEVEL_MIDDLE) {
-  unittest("liteos_a_security_vid_unittest") {
+  unittest("liteos_a_process_basic_unittest") {
     output_extension = "bin"
     output_dir = "$root_out_dir/test/unittest/kernel"
     include_dirs = common_include_dirs

testsuites/unittest/process/basic/config.gni

@@ -0,0 +1,58 @@
+# Copyright (c) 2022-2022 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("//build/lite/config/test.gni")
+import("//kernel/liteos_a/testsuites/unittest/config.gni")
+
+common_include_dirs = [
+  "//third_party/googletest/googletest/include",
+  "../../common/include",
+]
+
+sources_entry = [ "../../common/osTest.cpp" ]
+
+sources_smoke = []
+
+sources_full = []
+
+# basic module
+if (LOSCFG_USER_TEST_PROCESS == true) {
+  import("./process/config.gni")
+  common_include_dirs += process_include_dirs
+  sources_entry += process_sources_entry
+  sources_smoke += process_sources_smoke
+  sources_full += process_sources_full
+}
+
+if (LOSCFG_USER_TEST_PTHREAD == true) {
+  import("./pthread/config.gni")
+  common_include_dirs += pthread_include_dirs
+  sources_entry += pthread_sources_entry
+  sources_smoke += pthread_sources_smoke
+  sources_full += pthread_sources_full
+}

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

@@ -0,0 +1,114 @@
+# Copyright (c) 2022-2022 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/testsuites/unittest/config.gni")
+
+process_include_dirs = [ "$TEST_UNITTEST_DIR/process/basic/process" ]
+
+process_sources_entry =
+    [ "$TEST_UNITTEST_DIR/process/basic/process/process_process_test.cpp" ]
+
+process_sources_smoke = [
+  "$TEST_UNITTEST_DIR/process/basic/process/smoke/process_test_001.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/smoke/process_test_002.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/smoke/process_test_004.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/smoke/process_test_005.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/smoke/process_test_006.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/smoke/process_test_008.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/smoke/process_test_009.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/smoke/process_test_010.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/smoke/process_test_011.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/smoke/process_test_012.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/smoke/process_test_013.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/smoke/process_test_014.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/smoke/process_test_015.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/smoke/process_test_016.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/smoke/process_test_017.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/smoke/process_test_018.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/smoke/process_test_019.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/smoke/process_test_020.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/smoke/process_test_021.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/smoke/process_test_022.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/smoke/process_test_023.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/smoke/process_test_024.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/smoke/process_test_025.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/smoke/process_test_026.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/smoke/process_test_027.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/smoke/process_test_029.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/smoke/process_test_030.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/smoke/process_test_038.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/smoke/process_test_039.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/smoke/process_test_043.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/smoke/process_test_044.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/smoke/process_test_045.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/smoke/process_test_046.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/smoke/process_test_047.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/smoke/process_test_048.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/smoke/process_test_054.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/smoke/process_test_061.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/smp/process_test_smp_001.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/smp/process_test_smp_002.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/smp/process_test_smp_003.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/smp/process_test_smp_004.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/smp/process_test_smp_005.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/smp/process_test_smp_006.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/smp/process_test_smp_007.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/smp/process_test_smp_008.cpp",
+]
+
+process_sources_full = [
+  "$TEST_UNITTEST_DIR/process/basic/process/full/process_test_007.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/full/process_test_031.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/full/process_test_032.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/full/process_test_033.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/full/process_test_034.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/full/process_test_035.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/full/process_test_036.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/full/process_test_037.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/full/process_test_040.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/full/process_test_041.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/full/process_test_042.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/full/process_test_049.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/full/process_test_050.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/full/process_test_051.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/full/process_test_055.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/full/process_test_056.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/full/process_test_057.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/full/process_test_058.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/full/process_test_059.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/full/process_test_060.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/full/process_test_063.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/full/process_test_064.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/full/process_test_065.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/full/process_test_066.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/full/process_test_067.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/full/process_test_068.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/full/process_test_069.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/full/process_test_053.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/process/full/process_test_062.cpp",
+]

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

@@ -28,39 +28,39 @@
 
 import("//kernel/liteos_a/testsuites/unittest/config.gni")
 
-pthread_include_dirs = [ "$TEST_UNITTEST_DIR/basic/process/pthread" ]
+pthread_include_dirs = [ "$TEST_UNITTEST_DIR/process/basic/pthread" ]
 
 pthread_sources_entry =
-    [ "$TEST_UNITTEST_DIR/basic/process/pthread/process_pthread_test.cpp" ]
+    [ "$TEST_UNITTEST_DIR/process/basic/pthread/process_pthread_test.cpp" ]
 
 pthread_sources_smoke = [
-  "$TEST_UNITTEST_DIR/basic/process/pthread/smoke/pthread_atfork_test_001.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/pthread/smoke/pthread_atfork_test_002.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/pthread/smoke/pthread_cond_test_001.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/pthread/smoke/pthread_cond_test_002.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/pthread/smoke/pthread_cond_test_003.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/pthread/smoke/pthread_cond_test_004.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/pthread/smoke/pthread_once_test_001.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/pthread/smoke/pthread_test_003.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/pthread/smoke/pthread_test_006.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/pthread/smoke/pthread_test_007.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/pthread/smoke/pthread_test_008.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/pthread/smoke/pthread_test_009.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/pthread/smoke/pthread_test_010.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/pthread/smoke/pthread_test_011.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/pthread/smoke/pthread_test_012.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/pthread/smoke/pthread_test_013.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/pthread/smoke/pthread_test_015.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/pthread/smoke/pthread_test_016.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/pthread/smoke/pthread_test_017.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/pthread/smoke/pthread_test_018.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/pthread/smoke/pthread_test_019.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/pthread/smoke/pthread_atfork_test_001.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/pthread/smoke/pthread_atfork_test_002.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/pthread/smoke/pthread_cond_test_001.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/pthread/smoke/pthread_cond_test_002.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/pthread/smoke/pthread_cond_test_003.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/pthread/smoke/pthread_cond_test_004.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/pthread/smoke/pthread_once_test_001.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/pthread/smoke/pthread_test_003.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/pthread/smoke/pthread_test_006.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/pthread/smoke/pthread_test_007.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/pthread/smoke/pthread_test_008.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/pthread/smoke/pthread_test_009.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/pthread/smoke/pthread_test_010.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/pthread/smoke/pthread_test_011.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/pthread/smoke/pthread_test_012.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/pthread/smoke/pthread_test_013.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/pthread/smoke/pthread_test_015.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/pthread/smoke/pthread_test_016.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/pthread/smoke/pthread_test_017.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/pthread/smoke/pthread_test_018.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/pthread/smoke/pthread_test_019.cpp",
 ]
 
 pthread_sources_full = [
-  "$TEST_UNITTEST_DIR/basic/process/pthread/full/pthread_test_001.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/pthread/full/pthread_test_002.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/pthread/full/pthread_test_004.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/pthread/full/pthread_test_005.cpp",
-  "$TEST_UNITTEST_DIR/basic/process/pthread/full/pthread_test_014.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/pthread/full/pthread_test_001.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/pthread/full/pthread_test_002.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/pthread/full/pthread_test_004.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/pthread/full/pthread_test_005.cpp",
+  "$TEST_UNITTEST_DIR/process/basic/pthread/full/pthread_test_014.cpp",
 ]