packages/iSulad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
iSulad/0030-adaptor-unit-test-for-cgroup-module.patch

352 lines
21 KiB
Diff
Raw Normal View History

add support for cgroup v2 Signed-off-by: zhongtao <zhongtao17@huawei.com> (cherry picked from commit 8e60786a9fa82786c1d59abc85822ea46edc4d7d)
2024-03-30 15:13:33 +08:00
From 59e7ea0f16e83e0bdbc39bdc41d1ade8d3db885e Mon Sep 17 00:00:00 2001
From: zhongtao <zhongtao17@huawei.com>
Date: Thu, 22 Feb 2024 09:52:30 +0800
Subject: [PATCH 30/34] adaptor unit test for cgroup module
Signed-off-by: zhongtao <zhongtao17@huawei.com>
---
src/daemon/modules/image/CMakeLists.txt | 6 ++++--
test/cgroup/cpu/CMakeLists.txt | 7 +++++--
test/cgroup/cpu/cgroup_cpu_ut.cc | 12 ++++++++++--
test/image/oci/oci_config_merge/CMakeLists.txt | 7 +++++--
test/image/oci/registry/CMakeLists.txt | 7 +++++--
test/network/network_ns/CMakeLists.txt | 7 +++++--
test/runtime/isula/CMakeLists.txt | 7 +++++--
test/runtime/lcr/CMakeLists.txt | 7 +++++--
.../execute/execution_extend/CMakeLists.txt | 6 +++++-
test/specs/specs/CMakeLists.txt | 7 +++++--
test/specs/specs_extend/CMakeLists.txt | 7 +++++--
test/specs/verify/CMakeLists.txt | 7 +++++--
test/volume/CMakeLists.txt | 7 +++++--
13 files changed, 69 insertions(+), 25 deletions(-)
diff --git a/src/daemon/modules/image/CMakeLists.txt b/src/daemon/modules/image/CMakeLists.txt
index f8bc5840..d8b78ce1 100644
--- a/src/daemon/modules/image/CMakeLists.txt
+++ b/src/daemon/modules/image/CMakeLists.txt
@@ -68,8 +68,9 @@ set(LIB_ISULAD_IMG_SRCS
${CMAKE_SOURCE_DIR}/src/utils/buffer/buffer.c
${CMAKE_SOURCE_DIR}/src/daemon/common/err_msg.c
${CMAKE_SOURCE_DIR}/src/daemon/common/sysinfo.c
- ${CMAKE_SOURCE_DIR}/src/daemon/common/cgroup.c
- ${CMAKE_SOURCE_DIR}/src/daemon/common/cgroup_v1.c
+ ${CMAKE_SOURCE_DIR}/src/daemon/common/cgroup/cgroup.c
+ ${CMAKE_SOURCE_DIR}/src/daemon/common/cgroup/cgroup_v1.c
+ ${CMAKE_SOURCE_DIR}/src/daemon/common/cgroup/cgroup_v2.c
${CMAKE_SOURCE_DIR}/src/utils/tar/util_gzip.c
${CMAKE_SOURCE_DIR}/src/daemon/config/isulad_config.c
${CMAKE_SOURCE_DIR}/src/daemon/config/daemon_arguments.c
@@ -102,6 +103,7 @@ target_include_directories(${LIB_ISULAD_IMG} PUBLIC
${CMAKE_SOURCE_DIR}/src/utils/tar
${CMAKE_SOURCE_DIR}/src/daemon/config
${CMAKE_SOURCE_DIR}/src/daemon/common
+ ${CMAKE_SOURCE_DIR}/src/daemon/common/cgroup
${CMAKE_SOURCE_DIR}/src/daemon/modules/spec/
${CMAKE_SOURCE_DIR}/src/utils/cutils
${CMAKE_SOURCE_DIR}/src/utils/cutils/map
diff --git a/test/cgroup/cpu/CMakeLists.txt b/test/cgroup/cpu/CMakeLists.txt
index 32fe0a23..30bfc417 100644
--- a/test/cgroup/cpu/CMakeLists.txt
+++ b/test/cgroup/cpu/CMakeLists.txt
@@ -6,8 +6,10 @@ add_executable(${EXE}
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/utils/cutils/path.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/err_msg.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/sysinfo.c
- ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/cgroup.c
- ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/cgroup_v1.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/cgroup/cgroup.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/cgroup/cgroup_v1.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/cgroup/cgroup_v2.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/cgroup/cgroup_common.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/cmd/command_parser.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/config/daemon_arguments.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/config/isulad_config.c
@@ -20,6 +22,7 @@ target_include_directories(${EXE} PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/common
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/config
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/cgroup
${CMAKE_BINARY_DIR}/conf
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/config
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/cmd
diff --git a/test/cgroup/cpu/cgroup_cpu_ut.cc b/test/cgroup/cpu/cgroup_cpu_ut.cc
index eaee90c0..6e6e04f4 100644
--- a/test/cgroup/cpu/cgroup_cpu_ut.cc
+++ b/test/cgroup/cpu/cgroup_cpu_ut.cc
@@ -69,13 +69,21 @@ TEST(CgroupCpuUnitTest, test_common_find_cgroup_mnt_and_root)
{
char *mnt = NULL;
char *root = NULL;
- ASSERT_EQ(common_find_cgroup_mnt_and_root(nullptr, &mnt, &root), -1);
+
+ int ret = cgroup_ops_init();
+ ASSERT_EQ(ret, 0);
+
+ ASSERT_EQ(common_get_cgroup_mnt_and_root_path(nullptr, &mnt, &root), -1);
}
TEST(CgroupCpuUnitTest, test_sysinfo_cgroup_controller_cpurt_mnt_path)
{
MOCK_SET(util_common_calloc_s, nullptr);
ASSERT_EQ(get_sys_info(true), nullptr);
- ASSERT_EQ(sysinfo_cgroup_controller_cpurt_mnt_path(), nullptr);
+
+ int ret = cgroup_ops_init();
+ ASSERT_EQ(ret, 0);
+
+ ASSERT_EQ(sysinfo_get_cpurt_mnt_path(), nullptr);
MOCK_CLEAR(util_common_calloc_s);
}
diff --git a/test/image/oci/oci_config_merge/CMakeLists.txt b/test/image/oci/oci_config_merge/CMakeLists.txt
index 90809080..d13ec738 100644
--- a/test/image/oci/oci_config_merge/CMakeLists.txt
+++ b/test/image/oci/oci_config_merge/CMakeLists.txt
@@ -25,8 +25,10 @@ add_executable(${EXE}
${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/daemon/common/err_msg.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/daemon/config/isulad_config.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/daemon/common/sysinfo.c
- ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/daemon/common/cgroup.c
- ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/daemon/common/cgroup_v1.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/daemon/common/cgroup/cgroup.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/daemon/common/cgroup/cgroup_v1.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/daemon/common/cgroup/cgroup_v2.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/daemon/common/cgroup/cgroup_common.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/cmd/command_parser.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/daemon/config/daemon_arguments.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../../test/image/oci/oci_ut_common.cc
@@ -55,6 +57,7 @@ target_include_directories(${EXE} PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/utils/cutils/map
${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/daemon/config
${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/daemon/common
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/daemon/common/cgroup
${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/daemon/modules/volume
${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/daemon/modules/api
${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/daemon/modules/runtime/engines
diff --git a/test/image/oci/registry/CMakeLists.txt b/test/image/oci/registry/CMakeLists.txt
index 77a7907e..5b5bc3f5 100644
--- a/test/image/oci/registry/CMakeLists.txt
+++ b/test/image/oci/registry/CMakeLists.txt
@@ -26,8 +26,10 @@ add_executable(${EXE}
${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/daemon/modules/image/oci/storage/image_store/image_type.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/daemon/modules/image/oci/registry_type.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/daemon/common/sysinfo.c
- ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/daemon/common/cgroup.c
- ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/daemon/common/cgroup_v1.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/daemon/common/cgroup/cgroup.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/daemon/common/cgroup/cgroup_v1.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/daemon/common/cgroup/cgroup_v2.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/daemon/common/cgroup/cgroup_common.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/daemon/modules/image/oci/storage/image_store/image_store.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/daemon/modules/image/oci/storage/remote_layer_support/ro_symlink_maintain.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/daemon/modules/image/oci/registry/registry.c
@@ -58,6 +60,7 @@ target_include_directories(${EXE} PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/daemon/modules/api
${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/daemon/config
${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/daemon/common
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/daemon/common/cgroup
${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/daemon
${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/daemon/modules/image/oci/storage
${CMAKE_CURRENT_SOURCE_DIR}/../../../../src/daemon/modules/image/oci/storage/image_store
diff --git a/test/network/network_ns/CMakeLists.txt b/test/network/network_ns/CMakeLists.txt
index 50520427..71b8039d 100644
--- a/test/network/network_ns/CMakeLists.txt
+++ b/test/network/network_ns/CMakeLists.txt
@@ -30,8 +30,10 @@ add_executable(${EXE}
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/config/daemon_arguments.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/err_msg.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/sysinfo.c
- ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/cgroup.c
- ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/cgroup_v1.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/cgroup/cgroup.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/cgroup/cgroup_v1.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/cgroup/cgroup_v2.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/cgroup/cgroup_common.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/cmd/command_parser.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../test/image/oci/oci_ut_common.cc
${CMAKE_CURRENT_SOURCE_DIR}/../../../test/mocks/image_mock.cc
@@ -55,6 +57,7 @@ target_include_directories(${EXE} PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/cmd/options
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/config
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/cgroup
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/modules/api
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/modules/volume
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/modules/runtime
diff --git a/test/runtime/isula/CMakeLists.txt b/test/runtime/isula/CMakeLists.txt
index cc1178b8..c1f0a5cc 100644
--- a/test/runtime/isula/CMakeLists.txt
+++ b/test/runtime/isula/CMakeLists.txt
@@ -21,8 +21,10 @@ add_executable(${EXE}
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/utils/cutils/mainloop.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/err_msg.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/sysinfo.c
- ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/cgroup.c
- ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/cgroup_v1.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/cgroup/cgroup.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/cgroup/cgroup_v1.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/cgroup/cgroup_v2.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/cgroup/cgroup_common.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/cmd/command_parser.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/config/daemon_arguments.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../test/image/oci/oci_ut_common.cc
@@ -51,6 +53,7 @@ target_include_directories(${EXE} PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/cmd
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/config
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/cgroup
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/modules/container
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/modules/container/restart_manager
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/modules/container/health_check
diff --git a/test/runtime/lcr/CMakeLists.txt b/test/runtime/lcr/CMakeLists.txt
index 424a6101..c3b93d67 100644
--- a/test/runtime/lcr/CMakeLists.txt
+++ b/test/runtime/lcr/CMakeLists.txt
@@ -18,8 +18,10 @@ add_executable(${EXE}
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/utils/cutils/map/rb_tree.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/err_msg.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/sysinfo.c
- ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/cgroup.c
- ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/cgroup_v1.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/cgroup/cgroup.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/cgroup/cgroup_v1.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/cgroup/cgroup_v2.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/cgroup/cgroup_common.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/cmd/command_parser.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/config/daemon_arguments.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../test/image/oci/oci_ut_common.cc
@@ -39,6 +41,7 @@ target_include_directories(${EXE} PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/utils/cutils/map
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/config
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/cgroup
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/modules/api
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/modules/container
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/modules/container/restart_manager
diff --git a/test/services/execution/execute/execution_extend/CMakeLists.txt b/test/services/execution/execute/execution_extend/CMakeLists.txt
index 68e0f443..f0875fd7 100644
--- a/test/services/execution/execute/execution_extend/CMakeLists.txt
+++ b/test/services/execution/execute/execution_extend/CMakeLists.txt
@@ -21,7 +21,10 @@ add_executable(${EXE}
${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/utils/cutils/mainloop.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/utils/cutils/filters.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/daemon/common/err_msg.c
- ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/daemon/common/cgroup.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/daemon/common/cgroup/cgroup.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/daemon/common/cgroup/cgroup_v1.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/daemon/common/cgroup/cgroup_v2.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/daemon/common/cgroup/cgroup_common.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/daemon/modules/events_sender/event_sender.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/utils/console/console.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/utils/cutils/utils.c
@@ -59,6 +62,7 @@ target_include_directories(${EXE} PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/utils/console
${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/daemon/config
${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/daemon/common
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/daemon/common/cgroup
${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/utils/cutils
${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/daemon/modules/api
${CMAKE_CURRENT_SOURCE_DIR}/../../../../../src/daemon/modules/image
diff --git a/test/specs/specs/CMakeLists.txt b/test/specs/specs/CMakeLists.txt
index 508123fa..45f688f9 100644
--- a/test/specs/specs/CMakeLists.txt
+++ b/test/specs/specs/CMakeLists.txt
@@ -28,8 +28,10 @@ add_executable(${EXE}
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/modules/spec/specs_security.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/err_msg.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/sysinfo.c
- ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/cgroup.c
- ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/cgroup_v1.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/cgroup/cgroup.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/cgroup/cgroup_v1.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/cgroup/cgroup_v2.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/cgroup/cgroup_common.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/cmd/command_parser.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/config/daemon_arguments.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../test/image/oci/oci_ut_common.cc
@@ -54,6 +56,7 @@ target_include_directories(${EXE} PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/cmd/isulad
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/config
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/cgroup
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/modules/api
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/modules/volume
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/modules/runtime
diff --git a/test/specs/specs_extend/CMakeLists.txt b/test/specs/specs_extend/CMakeLists.txt
index bf4b378e..1b737089 100644
--- a/test/specs/specs_extend/CMakeLists.txt
+++ b/test/specs/specs_extend/CMakeLists.txt
@@ -28,8 +28,10 @@ add_executable(${EXE}
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/modules/spec/specs_security.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/err_msg.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/sysinfo.c
- ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/cgroup.c
- ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/cgroup_v1.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/cgroup/cgroup.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/cgroup/cgroup_v1.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/cgroup/cgroup_v2.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/cgroup/cgroup_common.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/cmd/command_parser.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/config/daemon_arguments.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../test/image/oci/oci_ut_common.cc
@@ -54,6 +56,7 @@ target_include_directories(${EXE} PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/cmd/isulad
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/config
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/cgroup
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/modules/volume
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/modules/api
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/modules/container
diff --git a/test/specs/verify/CMakeLists.txt b/test/specs/verify/CMakeLists.txt
index 0e60a39e..b0602127 100644
--- a/test/specs/verify/CMakeLists.txt
+++ b/test/specs/verify/CMakeLists.txt
@@ -23,8 +23,10 @@ add_executable(${EXE}
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/utils/cutils/map/rb_tree.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/err_msg.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/sysinfo.c
- ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/cgroup.c
- ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/cgroup_v1.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/cgroup/cgroup.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/cgroup/cgroup_v1.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/cgroup/cgroup_v2.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/cgroup/cgroup_common.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/modules/spec/verify.c
${CMAKE_CURRENT_SOURCE_DIR}/../../../test/image/oci/oci_ut_common.cc
${CMAKE_CURRENT_SOURCE_DIR}/../../../test/mocks/containers_store_mock.cc
@@ -50,6 +52,7 @@ target_include_directories(${EXE} PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/cmd/isulad
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/config
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/common/cgroup
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/modules/api
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/modules/volume
${CMAKE_CURRENT_SOURCE_DIR}/../../../src/daemon/modules/runtime
diff --git a/test/volume/CMakeLists.txt b/test/volume/CMakeLists.txt
index cc309352..27d07330 100644
--- a/test/volume/CMakeLists.txt
+++ b/test/volume/CMakeLists.txt
@@ -20,8 +20,10 @@ add_executable(${EXE}
${CMAKE_CURRENT_SOURCE_DIR}/../../src/utils/sha256/sha256.c
${CMAKE_CURRENT_SOURCE_DIR}/../../src/daemon/common/err_msg.c
${CMAKE_CURRENT_SOURCE_DIR}/../../src/daemon/common/sysinfo.c
- ${CMAKE_CURRENT_SOURCE_DIR}/../../src/daemon/common/cgroup.c
- ${CMAKE_CURRENT_SOURCE_DIR}/../../src/daemon/common/cgroup_v1.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../src/daemon/common/cgroup/cgroup.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../src/daemon/common/cgroup/cgroup_v1.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../src/daemon/common/cgroup/cgroup_v2.c
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../src/daemon/common/cgroup/cgroup_common.c
${CMAKE_CURRENT_SOURCE_DIR}/../../src/cmd/command_parser.c
volume_ut.cc)
@@ -34,6 +36,7 @@ target_include_directories(${EXE} PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/../../src/utils/http
${CMAKE_CURRENT_SOURCE_DIR}/../../src/daemon/modules/api
${CMAKE_CURRENT_SOURCE_DIR}/../../src/daemon/common
+ ${CMAKE_CURRENT_SOURCE_DIR}/../../src/daemon/common/cgroup
${CMAKE_CURRENT_SOURCE_DIR}/../../src/daemon/modules/volume
${CMAKE_BINARY_DIR}/conf
${CMAKE_CURRENT_SOURCE_DIR}/../../src/utils/sha256
--
2.25.1
Reference in New Issue Copy Permalink