Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
iSulad
提交
14fe7d63
I
iSulad
项目概览
openeuler
/
iSulad
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
I
iSulad
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
14fe7d63
编写于
6月 02, 2020
作者:
J
jackey_1024
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
llt: update llt testcases
Signed-off-by:
N
jackey_1024
<
775326092@qq.com
>
上级
b4c3b025
变更
28
隐藏空白更改
内联
并排
Showing
28 changed file
with
117 addition
and
221 deletion
+117
-221
CI/Dockerfile
CI/Dockerfile
+19
-4
CI/make-and-install.sh
CI/make-and-install.sh
+11
-0
test/cmd/isula/extend/pause/CMakeLists.txt
test/cmd/isula/extend/pause/CMakeLists.txt
+4
-10
test/cmd/isula/extend/resume/CMakeLists.txt
test/cmd/isula/extend/resume/CMakeLists.txt
+4
-10
test/cmd/isula/infomation/info/CMakeLists.txt
test/cmd/isula/infomation/info/CMakeLists.txt
+4
-10
test/cmd/isula/infomation/ps/CMakeLists.txt
test/cmd/isula/infomation/ps/CMakeLists.txt
+4
-10
test/cmd/isulad-shim/CMakeLists.txt
test/cmd/isulad-shim/CMakeLists.txt
+2
-8
test/cutils/utils_array/CMakeLists.txt
test/cutils/utils_array/CMakeLists.txt
+4
-4
test/cutils/utils_convert/CMakeLists.txt
test/cutils/utils_convert/CMakeLists.txt
+4
-4
test/cutils/utils_string/CMakeLists.txt
test/cutils/utils_string/CMakeLists.txt
+4
-4
test/image/oci/oci_config_merge/CMakeLists.txt
test/image/oci/oci_config_merge/CMakeLists.txt
+3
-16
test/image/oci/oci_config_merge/oci_config_merge_llt.cc
test/image/oci/oci_config_merge/oci_config_merge_llt.cc
+3
-3
test/mocks/image_mock.cc
test/mocks/image_mock.cc
+14
-0
test/mocks/image_mock.h
test/mocks/image_mock.h
+2
-0
test/mocks/namespace_mock.cc
test/mocks/namespace_mock.cc
+3
-3
test/mocks/namespace_mock.h
test/mocks/namespace_mock.h
+1
-1
test/path/CMakeLists.txt
test/path/CMakeLists.txt
+4
-4
test/runtime/isula/CMakeLists.txt
test/runtime/isula/CMakeLists.txt
+1
-18
test/runtime/lcr/CMakeLists.txt
test/runtime/lcr/CMakeLists.txt
+3
-16
test/services/execution/execute/execution_extend/CMakeLists.txt
...ervices/execution/execute/execution_extend/CMakeLists.txt
+3
-16
test/services/execution/spec/CMakeLists.txt
test/services/execution/spec/CMakeLists.txt
+2
-12
test/services/execution/spec/selinux_label_mock_llt.cc
test/services/execution/spec/selinux_label_mock_llt.cc
+0
-16
test/services/graphdriver/driver/CMakeLists.txt
test/services/graphdriver/driver/CMakeLists.txt
+3
-5
test/specs/specs/CMakeLists.txt
test/specs/specs/CMakeLists.txt
+3
-19
test/specs/specs/specs_llt.cc
test/specs/specs/specs_llt.cc
+3
-3
test/specs/specs_extend/CMakeLists.txt
test/specs/specs_extend/CMakeLists.txt
+3
-19
test/specs/specs_extend/specs_extend_llt.cc
test/specs/specs_extend/specs_extend_llt.cc
+5
-5
test/test.sh
test/test.sh
+1
-1
未找到文件。
CI/Dockerfile
浏览文件 @
14fe7d63
...
...
@@ -59,10 +59,6 @@ RUN yum clean all && yum makecache && yum install -y epel-release && yum swap -y
unzip
\
tar
\
wget
\
gtest
\
gtest-devel
\
gmock
\
gmock-devel
\
cppcheck
\
python3
\
python3-pip
\
...
...
@@ -222,5 +218,24 @@ RUN export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH && \
make
install
&&
\
ldconfig
# install gtest/gmock
RUN
export
PKG_CONFIG_PATH
=
/usr/local/lib/pkgconfig:
$PKG_CONFIG_PATH
&&
\
set
-x
&&
\
cd
~
&&
\
git clone https://gitee.com/src-openeuler/gtest.git
&&
\
cd
gtest
&&
\
tar
xf release-1.8.1.tar.gz
&&
\
cd
googletest-release-1.8.1
&&
\
patch
-p1
-F1
-s
< ../gtest-1.8.1-null-pointer.patch
&&
\
patch
-p1
-F1
-s
< ../gtest-PR1839-Fix-Python3-support.patch
&&
\
patch
-p1
-F1
-s
< ../gtest-1.8.1-libversion.patch
&&
\
patch
-p1
-F1
-s
< ../gtest-1.8.1-add-missing-pkgconfig-requires.patch
&&
\
mkdir
-p
build
&&
\
cd
build
&&
\
cmake
-DBUILD_SHARED_LIBS
=
ON ../
&&
\
make
-j
$(
nproc
)
&&
\
make
install
&&
\
ldconfig
VOLUME
[ "/sys/fs/cgroup" ]
CMD
["/usr/sbin/init"]
CI/make-and-install.sh
浏览文件 @
14fe7d63
...
...
@@ -73,6 +73,17 @@ make install
sed
-i
's/"log-driver": "stdout"/"log-driver": "file"/g'
${
builddir
}
/etc/isulad/daemon.json
sed
-i
"/registry-mirrors/a
\
\"
https://hub-mirror.c.163.com
\"
"
${
builddir
}
/etc/isulad/daemon.json
echo_success
"===================RUN DT-LLT TESTCASES START========================="
cd
$ISULAD_COPY_PATH
rm
-rf
build
cd
./test
./test.sh
-m
-c
-r
if
[[
$?
-ne
0
]]
;
then
exit
1
fi
./test.sh
-e
echo_success
"===================RUN DT-LLT TESTCASES END========================="
# build rest version
cd
$ISULAD_COPY_PATH
rm
-rf
build
...
...
test/cmd/isula/extend/pause/CMakeLists.txt
浏览文件 @
14fe7d63
...
...
@@ -3,7 +3,6 @@ project(iSulad_LLT)
SET
(
EXE pause_llt
)
add_executable
(
${
EXE
}
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/log.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/cutils/utils_string.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/cutils/utils.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/cutils/utils_array.c
...
...
@@ -13,6 +12,8 @@ add_executable(${EXE}
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/cutils/utils_regex.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/sha256/sha256.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/path.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/map/map.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/map/rb_tree.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/cmd/commander.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/console/console.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/cmd/isula/arguments.c
...
...
@@ -23,33 +24,26 @@ add_executable(${EXE}
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/container_def.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/error.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/connect/client/isula_connect.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/json/schema/src/read_file.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/cmd/isula/extend/pause.c
# ${CMAKE_CURRENT_SOURCE_DIR}/../../../../mocks/LcrcConnectMock.cc
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../mocks/grpc_client_mock.cc
${
CMAKE_BINARY_DIR
}
/json/json_common.c
${
CMAKE_BINARY_DIR
}
/json/host_config.c
${
CMAKE_BINARY_DIR
}
/json/container_path_stat.c
${
CMAKE_BINARY_DIR
}
/json/timestamp.c
pause_llt.cc
)
target_include_directories
(
${
EXE
}
PUBLIC
${
GTEST_INCLUDE_DIR
}
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../include
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/json
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/sha256
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/cutils
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/connect/client
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/cmd
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/map
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/http
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/console
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/cmd/isula
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/cmd/isula/extend
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/connect/client/grpc
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/json/schema/src
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../mocks
${
CMAKE_BINARY_DIR
}
/json
${
CMAKE_BINARY_DIR
}
/conf
)
target_link_libraries
(
${
EXE
}
${
GTEST_BOTH_LIBRARIES
}
${
GMOCK_LIBRARY
}
${
GMOCK_MAIN_LIBRARY
}
${
CMAKE_THREAD_LIBS_INIT
}
-lgrpc++ -lprotobuf -lcrypto -lyajl -lz
)
target_link_libraries
(
${
EXE
}
${
GTEST_BOTH_LIBRARIES
}
${
GMOCK_LIBRARY
}
${
GMOCK_MAIN_LIBRARY
}
${
CMAKE_THREAD_LIBS_INIT
}
${
ISULA_LIBUTILS_LIBRARY
}
-lgrpc++ -lprotobuf -lcrypto -lyajl -lz
)
test/cmd/isula/extend/resume/CMakeLists.txt
浏览文件 @
14fe7d63
...
...
@@ -3,7 +3,6 @@ project(iSulad_LLT)
SET
(
EXE resume_llt
)
add_executable
(
${
EXE
}
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/log.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/cutils/utils_string.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/cutils/utils.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/cutils/utils_array.c
...
...
@@ -13,6 +12,8 @@ add_executable(${EXE}
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/cutils/utils_regex.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/sha256/sha256.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/path.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/map/map.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/map/rb_tree.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/cmd/commander.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/console/console.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/cmd/isula/arguments.c
...
...
@@ -23,21 +24,16 @@ add_executable(${EXE}
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/container_def.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/error.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/connect/client/isula_connect.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/json/schema/src/read_file.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/cmd/isula/extend/resume.c
# ${CMAKE_CURRENT_SOURCE_DIR}/../../../../mocks/LcrcConnectMock.cc
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../mocks/grpc_client_mock.cc
${
CMAKE_BINARY_DIR
}
/json/json_common.c
${
CMAKE_BINARY_DIR
}
/json/host_config.c
${
CMAKE_BINARY_DIR
}
/json/container_path_stat.c
${
CMAKE_BINARY_DIR
}
/json/timestamp.c
resume_llt.cc
)
target_include_directories
(
${
EXE
}
PUBLIC
${
GTEST_INCLUDE_DIR
}
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../include
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/
json
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/
map
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/sha256
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/cutils
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/connect/client
...
...
@@ -47,10 +43,8 @@ target_include_directories(${EXE} PUBLIC
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/cmd/isula
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/cmd/isula/extend
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/connect/client/grpc
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/json/schema/src
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../mocks
${
CMAKE_BINARY_DIR
}
/json
${
CMAKE_BINARY_DIR
}
/conf
)
target_link_libraries
(
${
EXE
}
${
GTEST_BOTH_LIBRARIES
}
${
GMOCK_LIBRARY
}
${
GMOCK_MAIN_LIBRARY
}
${
CMAKE_THREAD_LIBS_INIT
}
-lgrpc++ -lprotobuf -lcrypto -lyajl -lz
)
target_link_libraries
(
${
EXE
}
${
GTEST_BOTH_LIBRARIES
}
${
GMOCK_LIBRARY
}
${
GMOCK_MAIN_LIBRARY
}
${
CMAKE_THREAD_LIBS_INIT
}
${
ISULA_LIBUTILS_LIBRARY
}
-lgrpc++ -lprotobuf -lcrypto -lyajl -lz
)
test/cmd/isula/infomation/info/CMakeLists.txt
浏览文件 @
14fe7d63
...
...
@@ -3,7 +3,6 @@ project(iSulad_LLT)
SET
(
EXE info_llt
)
add_executable
(
${
EXE
}
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/log.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/cutils/utils_string.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/cutils/utils.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/cutils/utils_array.c
...
...
@@ -14,6 +13,8 @@ add_executable(${EXE}
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/cutils/util_atomic.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/sha256/sha256.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/path.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/map/map.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/map/rb_tree.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/cmd/commander.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/console/console.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/cmd/isula/arguments.c
...
...
@@ -24,20 +25,15 @@ add_executable(${EXE}
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/container_def.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/error.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/connect/client/isula_connect.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/json/schema/src/read_file.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/cmd/isula/information/info.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../mocks/grpc_client_mock.cc
${
CMAKE_BINARY_DIR
}
/json/json_common.c
${
CMAKE_BINARY_DIR
}
/json/host_config.c
${
CMAKE_BINARY_DIR
}
/json/container_path_stat.c
${
CMAKE_BINARY_DIR
}
/json/timestamp.c
info_llt.cc
)
target_include_directories
(
${
EXE
}
PUBLIC
${
GTEST_INCLUDE_DIR
}
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../include
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/
json
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/
map
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/sha256
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/cutils
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/connect/client
...
...
@@ -47,9 +43,7 @@ target_include_directories(${EXE} PUBLIC
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/cmd/isula
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/cmd/isula/information
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/connect/client/grpc
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/json/schema/src
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../mocks
${
CMAKE_BINARY_DIR
}
/json
${
CMAKE_BINARY_DIR
}
/conf
)
target_link_libraries
(
${
EXE
}
${
GTEST_BOTH_LIBRARIES
}
${
GMOCK_LIBRARY
}
${
GMOCK_MAIN_LIBRARY
}
${
CMAKE_THREAD_LIBS_INIT
}
-lgrpc++ -lprotobuf -lcrypto -lyajl -lz
)
target_link_libraries
(
${
EXE
}
${
GTEST_BOTH_LIBRARIES
}
${
GMOCK_LIBRARY
}
${
GMOCK_MAIN_LIBRARY
}
${
CMAKE_THREAD_LIBS_INIT
}
${
ISULA_LIBUTILS_LIBRARY
}
-lgrpc++ -lprotobuf -lcrypto -lyajl -lz
)
test/cmd/isula/infomation/ps/CMakeLists.txt
浏览文件 @
14fe7d63
...
...
@@ -3,7 +3,6 @@ project(iSulad_LLT)
SET
(
EXE ps_llt
)
add_executable
(
${
EXE
}
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/log.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/cutils/utils_string.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/cutils/utils.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/cutils/utils_array.c
...
...
@@ -13,6 +12,8 @@ add_executable(${EXE}
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/cutils/utils_regex.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/sha256/sha256.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/path.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/map/map.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/map/rb_tree.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/cmd/commander.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/console/console.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/cmd/isula/arguments.c
...
...
@@ -23,20 +24,15 @@ add_executable(${EXE}
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/container_def.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/error.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/connect/client/isula_connect.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/json/schema/src/read_file.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/cmd/isula/information/ps.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../mocks/grpc_client_mock.cc
${
CMAKE_BINARY_DIR
}
/json/json_common.c
${
CMAKE_BINARY_DIR
}
/json/host_config.c
${
CMAKE_BINARY_DIR
}
/json/container_path_stat.c
${
CMAKE_BINARY_DIR
}
/json/timestamp.c
ps_llt.cc
)
target_include_directories
(
${
EXE
}
PUBLIC
${
GTEST_INCLUDE_DIR
}
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../include
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/
json
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/
map
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/sha256
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/cutils
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/connect/client
...
...
@@ -46,9 +42,7 @@ target_include_directories(${EXE} PUBLIC
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/cmd/isula
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/cmd/isula/information
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/connect/client/grpc
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/json/schema/src
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../mocks
${
CMAKE_BINARY_DIR
}
/json
${
CMAKE_BINARY_DIR
}
/conf
)
target_link_libraries
(
${
EXE
}
${
GTEST_BOTH_LIBRARIES
}
${
GMOCK_LIBRARY
}
${
GMOCK_MAIN_LIBRARY
}
${
CMAKE_THREAD_LIBS_INIT
}
-lgrpc++ -lprotobuf -lcrypto -lyajl -lz
)
target_link_libraries
(
${
EXE
}
${
GTEST_BOTH_LIBRARIES
}
${
GMOCK_LIBRARY
}
${
GMOCK_MAIN_LIBRARY
}
${
CMAKE_THREAD_LIBS_INIT
}
${
ISULA_LIBUTILS_LIBRARY
}
-lgrpc++ -lprotobuf -lcrypto -lyajl -lz
)
test/cmd/isulad-shim/CMakeLists.txt
浏览文件 @
14fe7d63
...
...
@@ -5,18 +5,12 @@ SET(EXE isulad-shim_llt)
add_executable
(
${
EXE
}
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cmd/isulad-shim/process.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cmd/isulad-shim/common.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/json/schema/src/read_file.c
${
CMAKE_BINARY_DIR
}
/json/json_common.c
${
CMAKE_BINARY_DIR
}
/json/host_config.c
${
CMAKE_BINARY_DIR
}
/json/shim_client_process_state.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cmd/isulad-shim/terminal.c
isulad-shim_llt.cc
)
target_include_directories
(
${
EXE
}
PUBLIC
${
GTEST_INCLUDE_DIR
}
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cmd/isulad-shim
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/json
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/json/schema/src/
${
CMAKE_BINARY_DIR
}
/json
${
CMAKE_BINARY_DIR
}
/conf
)
target_link_libraries
(
${
EXE
}
${
GTEST_BOTH_LIBRARIES
}
${
GMOCK_LIBRARY
}
${
GMOCK_MAIN_LIBRARY
}
${
CMAKE_THREAD_LIBS_INIT
}
-lyajl
)
target_link_libraries
(
${
EXE
}
${
GTEST_BOTH_LIBRARIES
}
${
GMOCK_LIBRARY
}
${
GMOCK_MAIN_LIBRARY
}
${
CMAKE_THREAD_LIBS_INIT
}
${
ISULA_LIBUTILS_LIBRARY
}
-lyajl
)
test/cutils/utils_array/CMakeLists.txt
浏览文件 @
14fe7d63
...
...
@@ -3,7 +3,6 @@ project(iSulad_LLT)
SET
(
EXE utils_array_llt
)
add_executable
(
${
EXE
}
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/log.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cutils/utils_string.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cutils/utils.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cutils/utils_array.c
...
...
@@ -12,17 +11,18 @@ add_executable(${EXE}
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cutils/utils_verify.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cutils/utils_regex.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/sha256/sha256.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/map/map.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/map/rb_tree.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/path.c
${
CMAKE_BINARY_DIR
}
/json/json_common.c
utils_array_llt.cc
)
target_include_directories
(
${
EXE
}
PUBLIC
${
GTEST_INCLUDE_DIR
}
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../include
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/map
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/sha256
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cutils
${
CMAKE_BINARY_DIR
}
/json
)
set_target_properties
(
${
EXE
}
PROPERTIES LINK_FLAGS
"-Wl,--wrap,calloc"
)
target_link_libraries
(
${
EXE
}
${
GTEST_BOTH_LIBRARIES
}
${
CMAKE_THREAD_LIBS_INIT
}
-lyajl -lz
)
target_link_libraries
(
${
EXE
}
${
GTEST_BOTH_LIBRARIES
}
${
CMAKE_THREAD_LIBS_INIT
}
${
ISULA_LIBUTILS_LIBRARY
}
-lcrypto
-lyajl -lz
)
test/cutils/utils_convert/CMakeLists.txt
浏览文件 @
14fe7d63
...
...
@@ -3,7 +3,6 @@ project(iSulad_LLT)
SET
(
EXE utils_convert_llt
)
add_executable
(
${
EXE
}
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/log.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cutils/utils_string.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cutils/utils.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cutils/utils_array.c
...
...
@@ -13,15 +12,16 @@ add_executable(${EXE}
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cutils/utils_regex.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/sha256/sha256.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/path.c
${
CMAKE_BINARY_DIR
}
/json/json_common.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/map/map.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/map/rb_tree.c
utils_convert_llt.cc
)
target_include_directories
(
${
EXE
}
PUBLIC
${
GTEST_INCLUDE_DIR
}
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../include
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/map
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/sha256
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cutils
${
CMAKE_BINARY_DIR
}
/json
)
target_link_libraries
(
${
EXE
}
${
GTEST_BOTH_LIBRARIES
}
${
CMAKE_THREAD_LIBS_INIT
}
-lyajl -lz
)
target_link_libraries
(
${
EXE
}
${
GTEST_BOTH_LIBRARIES
}
${
CMAKE_THREAD_LIBS_INIT
}
${
ISULA_LIBUTILS_LIBRARY
}
-lcrypto
-lyajl -lz
)
test/cutils/utils_string/CMakeLists.txt
浏览文件 @
14fe7d63
...
...
@@ -3,7 +3,6 @@ project(iSulad_LLT)
SET
(
EXE utils_string_llt
)
add_executable
(
${
EXE
}
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/log.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cutils/utils_string.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cutils/utils.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cutils/utils_array.c
...
...
@@ -12,17 +11,18 @@ add_executable(${EXE}
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cutils/utils_verify.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cutils/utils_regex.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/sha256/sha256.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/map/map.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/map/rb_tree.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/path.c
${
CMAKE_BINARY_DIR
}
/json/json_common.c
utils_string_llt.cc
)
target_include_directories
(
${
EXE
}
PUBLIC
${
GTEST_INCLUDE_DIR
}
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../include
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/map
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/sha256
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cutils
${
CMAKE_BINARY_DIR
}
/json
)
set_target_properties
(
${
EXE
}
PROPERTIES LINK_FLAGS
"-Wl,--wrap,util_strdup_s -Wl,--wrap,calloc -Wl,--wrap,strcat_s"
)
target_link_libraries
(
${
EXE
}
${
GTEST_BOTH_LIBRARIES
}
${
CMAKE_THREAD_LIBS_INIT
}
-lyajl -lz
)
target_link_libraries
(
${
EXE
}
${
GTEST_BOTH_LIBRARIES
}
${
CMAKE_THREAD_LIBS_INIT
}
${
ISULA_LIBUTILS_LIBRARY
}
-lcrypto
-lyajl -lz
)
test/image/oci/oci_config_merge/CMakeLists.txt
浏览文件 @
14fe7d63
...
...
@@ -12,23 +12,15 @@ add_executable(${EXE}
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/cutils/utils_convert.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/cutils/utils_file.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/cutils/util_atomic.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/log.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/sha256/sha256.c
${
CMAKE_BINARY_DIR
}
/json/json_common.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/path.c
${
CMAKE_BINARY_DIR
}
/json/host_config.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/map/map.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/map/rb_tree.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/services/execution/spec/specs_extend.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/libisulad.c
${
CMAKE_BINARY_DIR
}
/json/defs.c
${
CMAKE_BINARY_DIR
}
/json/container_config_v2.c
${
CMAKE_BINARY_DIR
}
/json/container_config.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/config/isulad_config.c
${
CMAKE_BINARY_DIR
}
/json/oci_runtime_spec.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/services/execution/spec/sysinfo.c
${
CMAKE_BINARY_DIR
}
/json/oci_runtime_config_linux.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/cmd/commander.c
${
CMAKE_BINARY_DIR
}
/json/isulad_daemon_configs.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/json/schema/src/read_file.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/cmd/isulad/arguments.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../test/image/oci/oci_llt_common.cc
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../test/mocks/containers_store_mock.cc
...
...
@@ -36,8 +28,6 @@ add_executable(${EXE}
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../test/mocks/container_unix_mock.cc
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/services/execution/spec/specs_mount.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../test/mocks/selinux_label_mock.cc
${
CMAKE_BINARY_DIR
}
/json/imagetool_image.c
${
CMAKE_BINARY_DIR
}
/json/oci_image_spec.c
oci_config_merge_llt.cc
)
target_include_directories
(
${
EXE
}
PUBLIC
...
...
@@ -48,21 +38,18 @@ target_include_directories(${EXE} PUBLIC
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/map
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/engines
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/json
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/services/execution/spec
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/services/execution/manager
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/services/execution/events
${
CMAKE_BINARY_DIR
}
/json
${
CMAKE_BINARY_DIR
}
/conf
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/sha256
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/config
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/cmd
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/services/graphdriver
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/json/schema/src
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/console
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../test/image/oci
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../test/mocks
)
set_target_properties
(
${
EXE
}
PROPERTIES LINK_FLAGS
"-Wl,--wrap,util_common_calloc_s -Wl,--wrap,util_smart_calloc_s -Wl,--wrap,merge_env"
)
target_link_libraries
(
${
EXE
}
${
GTEST_BOTH_LIBRARIES
}
${
GMOCK_LIBRARY
}
${
GMOCK_MAIN_LIBRARY
}
${
CMAKE_THREAD_LIBS_INIT
}
-lgrpc++ -lprotobuf -lcrypto -lyajl -lz
)
target_link_libraries
(
${
EXE
}
${
GTEST_BOTH_LIBRARIES
}
${
GMOCK_LIBRARY
}
${
GMOCK_MAIN_LIBRARY
}
${
CMAKE_THREAD_LIBS_INIT
}
${
ISULA_LIBUTILS_LIBRARY
}
-lgrpc++ -lprotobuf -lcrypto -lyajl -lz
)
test/image/oci/oci_config_merge/oci_config_merge_llt.cc
浏览文件 @
14fe7d63
...
...
@@ -17,10 +17,10 @@
#include <stdio.h>
#include <gtest/gtest.h>
#include "mock.h"
#include "oci_runtime_spec.h"
#include "isula_libutils/oci_runtime_spec.h"
#include "isula_libutils/imagetool_image.h"
#include "isula_libutils/container_config.h"
#include "oci_config_merge.h"
#include "imagetool_image.h"
#include "container_config.h"
#include "oci_llt_common.h"
#define IMAGETOOL_IMAGE_FILE "image/oci/oci_config_merge/imagetool_image.json"
...
...
test/mocks/image_mock.cc
浏览文件 @
14fe7d63
...
...
@@ -55,3 +55,17 @@ void free_im_export_request(im_export_request *ptr)
return
g_image_mock
->
FreeImExportRequest
(
ptr
);
}
}
int
im_get_storage_metadata
(
const
char
*
image_type
,
char
*
id
,
im_storage_metadata_response
**
response
)
{
if
(
g_image_mock
!=
nullptr
)
{
return
g_image_mock
->
ImGetStorageMetadata
(
image_type
,
id
,
response
);
}
return
0
;
}
void
free_im_storage_metadata_response
(
im_storage_metadata_response
*
ptr
)
{
if
(
g_image_mock
!=
nullptr
)
{
return
g_image_mock
->
FreeImStorageMetadataResponse
(
ptr
);
}
}
test/mocks/image_mock.h
浏览文件 @
14fe7d63
...
...
@@ -26,6 +26,8 @@ public:
MOCK_METHOD1
(
FreeImStorageStatusResponse
,
void
(
im_storage_status_response
*
));
MOCK_METHOD1
(
ImContainerExport
,
int
(
const
im_export_request
*
request
));
MOCK_METHOD1
(
FreeImExportRequest
,
void
(
im_export_request
*
ptr
));
MOCK_METHOD3
(
ImGetStorageMetadata
,
int
(
const
char
*
image_type
,
char
*
id
,
im_storage_metadata_response
**
response
));
MOCK_METHOD1
(
FreeImStorageMetadataResponse
,
void
(
im_storage_metadata_response
*
ptr
));
};
void
MockImage_SetMock
(
MockImage
*
mock
);
...
...
test/mocks/namespace_mock.cc
浏览文件 @
14fe7d63
...
...
@@ -32,12 +32,12 @@ char *connected_container(const char *mode)
return
nullptr
;
}
char
*
get_share_namespace_path
(
const
char
*
type
,
const
char
*
src
_path
)
int
get_share_namespace_path
(
const
char
*
type
,
const
char
*
src_path
,
char
**
dest
_path
)
{
if
(
g_namespace_mock
!=
nullptr
)
{
return
g_namespace_mock
->
GetShareNamespacePath
(
type
,
src_path
);
return
g_namespace_mock
->
GetShareNamespacePath
(
type
,
src_path
,
dest_path
);
}
return
nullptr
;
return
0
;
}
char
*
get_container_process_label
(
const
char
*
path
)
...
...
test/mocks/namespace_mock.h
浏览文件 @
14fe7d63
...
...
@@ -23,7 +23,7 @@ class MockNamespace {
public:
virtual
~
MockNamespace
()
=
default
;
MOCK_METHOD1
(
ConnectedContainer
,
char
*
(
const
char
*
mode
));
MOCK_METHOD
2
(
GetShareNamespacePath
,
char
*
(
const
char
*
type
,
const
char
*
src
_path
));
MOCK_METHOD
3
(
GetShareNamespacePath
,
int
(
const
char
*
type
,
const
char
*
src_path
,
char
**
dest
_path
));
MOCK_METHOD1
(
GetContainerProcessLabel
,
char
*
(
const
char
*
path
));
};
...
...
test/path/CMakeLists.txt
浏览文件 @
14fe7d63
...
...
@@ -3,9 +3,10 @@ project(iSulad_LLT)
SET
(
EXE path_llt
)
add_executable
(
${
EXE
}
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../src/log.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../src/cutils/utils.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../src/path.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../src/map/map.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../src/map/rb_tree.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../src/cutils/utils_string.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../src/cutils/utils_array.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../src/cutils/utils_file.c
...
...
@@ -13,15 +14,14 @@ add_executable(${EXE}
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../src/cutils/utils_regex.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../src/cutils/utils_verify.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../src/sha256/sha256.c
${
CMAKE_BINARY_DIR
}
/json/json_common.c
path_llt.cc
)
target_include_directories
(
${
EXE
}
PUBLIC
${
CMAKE_CURRENT_SOURCE_DIR
}
/../include
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../src
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../src/map
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../src/cutils
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../src/sha256
${
CMAKE_BINARY_DIR
}
/json
)
set_target_properties
(
${
EXE
}
PROPERTIES LINK_FLAGS
"-Wl,--wrap,getcwd -Wl,--wrap,readlink"
)
target_link_libraries
(
${
EXE
}
${
GTEST_BOTH_LIBRARIES
}
${
CMAKE_THREAD_LIBS_INIT
}
-lyajl -lz
)
target_link_libraries
(
${
EXE
}
${
GTEST_BOTH_LIBRARIES
}
${
CMAKE_THREAD_LIBS_INIT
}
${
ISULA_LIBUTILS_LIBRARY
}
-lcrypto
-lyajl -lz
)
test/runtime/isula/CMakeLists.txt
浏览文件 @
14fe7d63
...
...
@@ -10,21 +10,11 @@ add_executable(${EXE}
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cutils/utils_string.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cutils/utils_convert.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cutils/utils_file.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/log.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/sha256/sha256.c
${
CMAKE_BINARY_DIR
}
/json/json_common.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/path.c
${
CMAKE_BINARY_DIR
}
/json/host_config.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/libisulad.c
${
CMAKE_BINARY_DIR
}
/json/defs.c
${
CMAKE_BINARY_DIR
}
/json/container_config_v2.c
${
CMAKE_BINARY_DIR
}
/json/container_config.c
${
CMAKE_BINARY_DIR
}
/json/oci_runtime_spec.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/services/execution/spec/sysinfo.c
${
CMAKE_BINARY_DIR
}
/json/oci_runtime_config_linux.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cmd/commander.c
${
CMAKE_BINARY_DIR
}
/json/isulad_daemon_configs.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/json/schema/src/read_file.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cmd/isulad/arguments.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../test/image/oci/oci_llt_common.cc
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../test/mocks/containers_store_mock.cc
...
...
@@ -32,10 +22,6 @@ add_executable(${EXE}
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../test/mocks/container_unix_mock.cc
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../test/mocks/engine_mock.cc
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../test/mocks/isulad_config_mock.cc
${
CMAKE_BINARY_DIR
}
/json/imagetool_image.c
${
CMAKE_BINARY_DIR
}
/json/oci_image_spec.c
${
CMAKE_BINARY_DIR
}
/json/shim_client_process_state.c
${
CMAKE_BINARY_DIR
}
/json/oci_runtime_state.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/runtime/isula/isula_rt_ops.c
isula_rt_ops_llt.cc
)
...
...
@@ -50,18 +36,15 @@ target_include_directories(${EXE} PUBLIC
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/runtime
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/runtime/isula
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/services/execution/spec
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/json
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/engines
${
CMAKE_BINARY_DIR
}
/json
${
CMAKE_BINARY_DIR
}
/conf
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/sha256
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/config
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cmd
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/services/graphdriver
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/json/schema/src
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/console
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../test/mocks
)
#set_target_properties(${EXE} PROPERTIES LINK_FLAGS)
target_link_libraries
(
${
EXE
}
${
GTEST_BOTH_LIBRARIES
}
${
GMOCK_LIBRARY
}
${
GMOCK_MAIN_LIBRARY
}
${
CMAKE_THREAD_LIBS_INIT
}
-lgrpc++ -lprotobuf -lcrypto -lyajl -lz
)
target_link_libraries
(
${
EXE
}
${
GTEST_BOTH_LIBRARIES
}
${
GMOCK_LIBRARY
}
${
GMOCK_MAIN_LIBRARY
}
${
CMAKE_THREAD_LIBS_INIT
}
${
ISULA_LIBUTILS_LIBRARY
}
-lgrpc++ -lprotobuf -lcrypto -lyajl -lz
)
test/runtime/lcr/CMakeLists.txt
浏览文件 @
14fe7d63
...
...
@@ -11,21 +11,13 @@ add_executable(${EXE}
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cutils/utils_convert.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cutils/utils_file.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cutils/util_atomic.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/log.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/sha256/sha256.c
${
CMAKE_BINARY_DIR
}
/json/json_common.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/path.c
${
CMAKE_BINARY_DIR
}
/json/host_config.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/map/map.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/map/rb_tree.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/libisulad.c
${
CMAKE_BINARY_DIR
}
/json/defs.c
${
CMAKE_BINARY_DIR
}
/json/container_config_v2.c
${
CMAKE_BINARY_DIR
}
/json/container_config.c
${
CMAKE_BINARY_DIR
}
/json/oci_runtime_spec.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/services/execution/spec/sysinfo.c
${
CMAKE_BINARY_DIR
}
/json/oci_runtime_config_linux.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cmd/commander.c
${
CMAKE_BINARY_DIR
}
/json/isulad_daemon_configs.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/json/schema/src/read_file.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cmd/isulad/arguments.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../test/image/oci/oci_llt_common.cc
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../test/mocks/containers_store_mock.cc
...
...
@@ -33,8 +25,6 @@ add_executable(${EXE}
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../test/mocks/container_unix_mock.cc
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../test/mocks/engine_mock.cc
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../test/mocks/isulad_config_mock.cc
${
CMAKE_BINARY_DIR
}
/json/imagetool_image.c
${
CMAKE_BINARY_DIR
}
/json/oci_image_spec.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/runtime/lcr/lcr_rt_ops.c
lcr_rt_ops_llt.cc
)
...
...
@@ -49,18 +39,15 @@ target_include_directories(${EXE} PUBLIC
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/runtime
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/runtime/lcr
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/services/execution/spec
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/json
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/engines
${
CMAKE_BINARY_DIR
}
/json
${
CMAKE_BINARY_DIR
}
/conf
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/sha256
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/config
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cmd
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/services/graphdriver
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/json/schema/src
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/console
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../test/mocks
)
#set_target_properties(${EXE} PROPERTIES LINK_FLAGS)
target_link_libraries
(
${
EXE
}
${
GTEST_BOTH_LIBRARIES
}
${
GMOCK_LIBRARY
}
${
GMOCK_MAIN_LIBRARY
}
${
CMAKE_THREAD_LIBS_INIT
}
-lgrpc++ -lprotobuf -lcrypto -lyajl -lz
)
target_link_libraries
(
${
EXE
}
${
GTEST_BOTH_LIBRARIES
}
${
GMOCK_LIBRARY
}
${
GMOCK_MAIN_LIBRARY
}
${
CMAKE_THREAD_LIBS_INIT
}
${
ISULA_LIBUTILS_LIBRARY
}
-lgrpc++ -lprotobuf -lcrypto -lyajl -lz
)
test/services/execution/execute/execution_extend/CMakeLists.txt
浏览文件 @
14fe7d63
...
...
@@ -3,7 +3,6 @@ project(iSulad_LLT)
SET
(
EXE execution_extend_llt
)
add_executable
(
${
EXE
}
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/log.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/cutils/utils_string.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/cutils/utils.c
...
...
@@ -16,6 +15,8 @@ add_executable(${EXE}
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/sha256/sha256.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/error.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/path.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/map/map.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/map/rb_tree.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/mainloop.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/filters.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/libisulad.c
...
...
@@ -25,8 +26,6 @@ add_executable(${EXE}
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/map/map.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/map/rb_tree.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/services/execution/execute/execution_extend.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/json/oci_runtime_hooks.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/json/schema/src/read_file.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../mocks/runtime_mock.cc
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../mocks/containers_store_mock.cc
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../mocks/collector_mock.cc
...
...
@@ -42,15 +41,6 @@ add_executable(${EXE}
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../mocks/driver_mock.cc
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../mocks/restartmanager_mock.cc
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../mocks/specs_mock.cc
${
CMAKE_BINARY_DIR
}
/json/container_inspect.c
${
CMAKE_BINARY_DIR
}
/json/oci_runtime_spec.c
${
CMAKE_BINARY_DIR
}
/json/json_common.c
${
CMAKE_BINARY_DIR
}
/json/container_stats_request.c
${
CMAKE_BINARY_DIR
}
/json/container_info.c
${
CMAKE_BINARY_DIR
}
/json/host_config.c
${
CMAKE_BINARY_DIR
}
/json/oci_runtime_config_linux.c
${
CMAKE_BINARY_DIR
}
/json/defs.c
${
CMAKE_BINARY_DIR
}
/json/docker_types_mount_point.c
execution_extend_llt.cc
)
target_include_directories
(
${
EXE
}
PUBLIC
...
...
@@ -61,7 +51,6 @@ target_include_directories(${EXE} PUBLIC
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/cmd
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/sha256
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/map
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/json
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/engines
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/console
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/config
...
...
@@ -74,9 +63,7 @@ target_include_directories(${EXE} PUBLIC
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/services/execution/events
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/services/execution/execute
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/services/graphdriver
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../src/json/schema/src
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../../conf
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../mocks
${
CMAKE_BINARY_DIR
}
/json
)
target_link_libraries
(
${
EXE
}
${
GTEST_BOTH_LIBRARIES
}
${
GMOCK_LIBRARY
}
${
GMOCK_MAIN_LIBRARY
}
${
CMAKE_THREAD_LIBS_INIT
}
-lgrpc++ -lprotobuf -lcrypto -lyajl -lz
)
target_link_libraries
(
${
EXE
}
${
GTEST_BOTH_LIBRARIES
}
${
GMOCK_LIBRARY
}
${
GMOCK_MAIN_LIBRARY
}
${
CMAKE_THREAD_LIBS_INIT
}
${
ISULA_LIBUTILS_LIBRARY
}
-lgrpc++ -lprotobuf -lcrypto -lyajl -lz
)
test/services/execution/spec/CMakeLists.txt
浏览文件 @
14fe7d63
...
...
@@ -11,16 +11,13 @@ add_executable(${EXE}
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/cutils/utils_string.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/cutils/utils_convert.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/cutils/utils_file.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/log.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/sha256/sha256.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/path.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/map/map.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/map/rb_tree.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/libisulad.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/json/schema/src/read_file.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../mocks/namespace_mock.cc
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/services/execution/spec/selinux_label.c
${
CMAKE_BINARY_DIR
}
/json/json_common.c
selinux_label_llt.cc
)
add_executable
(
${
MOCK_EXE
}
...
...
@@ -31,18 +28,15 @@ add_executable(${MOCK_EXE}
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/cutils/utils_string.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/cutils/utils_convert.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/cutils/utils_file.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/log.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/sha256/sha256.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/path.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/map/map.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/map/rb_tree.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/libisulad.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/json/schema/src/read_file.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../mocks/namespace_mock.cc
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../mocks/syscall_mock.cc
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../mocks/selinux_mock.cc
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/services/execution/spec/selinux_label.c
${
CMAKE_BINARY_DIR
}
/json/json_common.c
selinux_label_mock_llt.cc
)
target_include_directories
(
${
EXE
}
PUBLIC
...
...
@@ -52,12 +46,10 @@ target_include_directories(${EXE} PUBLIC
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/cutils
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/sha256
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/map
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/json/schema/src
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/services/execution/manager
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../mocks
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/services/execution/spec
${
CMAKE_BINARY_DIR
}
/conf
${
CMAKE_BINARY_DIR
}
/json
)
target_include_directories
(
${
MOCK_EXE
}
PUBLIC
...
...
@@ -67,13 +59,11 @@ target_include_directories(${MOCK_EXE} PUBLIC
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/cutils
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/sha256
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/map
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/json/schema/src
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/services/execution/manager
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../mocks
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/services/execution/spec
${
CMAKE_BINARY_DIR
}
/conf
${
CMAKE_BINARY_DIR
}
/json
)
target_link_libraries
(
${
EXE
}
${
GTEST_BOTH_LIBRARIES
}
${
GMOCK_LIBRARY
}
${
GMOCK_MAIN_LIBRARY
}
${
CMAKE_THREAD_LIBS_INIT
}
${
SELINUX_LIBRARY
}
-lyajl -lz
)
target_link_libraries
(
${
MOCK_EXE
}
${
GTEST_BOTH_LIBRARIES
}
${
GMOCK_LIBRARY
}
${
GMOCK_MAIN_LIBRARY
}
${
CMAKE_THREAD_LIBS_INIT
}
${
SELINUX_LIBRARY
}
-lyajl -lz
)
target_link_libraries
(
${
EXE
}
${
GTEST_BOTH_LIBRARIES
}
${
GMOCK_LIBRARY
}
${
GMOCK_MAIN_LIBRARY
}
${
CMAKE_THREAD_LIBS_INIT
}
${
SELINUX_LIBRARY
}
${
ISULA_LIBUTILS_LIBRARY
}
-lcrypto
-lyajl -lz
)
target_link_libraries
(
${
MOCK_EXE
}
${
GTEST_BOTH_LIBRARIES
}
${
GMOCK_LIBRARY
}
${
GMOCK_MAIN_LIBRARY
}
${
CMAKE_THREAD_LIBS_INIT
}
${
SELINUX_LIBRARY
}
${
ISULA_LIBUTILS_LIBRARY
}
-lcrypto
-lyajl -lz
)
test/services/execution/spec/selinux_label_mock_llt.cc
浏览文件 @
14fe7d63
...
...
@@ -50,19 +50,3 @@ TEST_F(SELinuxGetEnableUnitTest, test_selinux_get_enable_abnormal)
EXPECT_CALL
(
m_selinux
,
SelinuxfsExists
()).
WillOnce
(
Return
(
-
1
));
ASSERT_EQ
(
selinux_get_enable
(),
false
);
}
TEST_F
(
SELinuxGetEnableUnitTest
,
test_selinux_get_enable_normal
)
{
const
uint32_t
selinuxfsMagic
=
0xf97cff8c
;
struct
statfs
sfbuf
{
.
f_type
=
selinuxfsMagic
,
.
f_flags
=
0
};
EXPECT_CALL
(
m_syscall
,
Statfs
(
_
,
_
))
.
WillOnce
(
Return
(
EPERM
))
.
WillOnce
(
DoAll
(
SetArgPointee
<
1
>
(
ByRef
(
sfbuf
)),
Return
(
0
)));
EXPECT_CALL
(
m_selinux
,
SelinuxfsExists
()).
WillOnce
(
Return
(
-
1
));
ASSERT_EQ
(
selinux_get_enable
(),
true
);
}
test/services/graphdriver/driver/CMakeLists.txt
浏览文件 @
14fe7d63
...
...
@@ -10,8 +10,9 @@ add_executable(${EXE}
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/cutils/utils_string.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/cutils/utils_convert.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/cutils/utils_file.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/log.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/path.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/map/map.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/map/rb_tree.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/sha256/sha256.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../test/mocks/driver_overlay2_mock.cc
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../test/mocks/image_mock.cc
...
...
@@ -19,17 +20,14 @@ add_executable(${EXE}
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/services/graphdriver/driver.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/services/graphdriver/devmapper/driver_devmapper.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/libisulad.c
${
CMAKE_BINARY_DIR
}
/json/json_common.c
driver_llt.cc
)
target_include_directories
(
${
EXE
}
PUBLIC
${
GTEST_INCLUDE_DIR
}
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../test/include
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/json
${
ENGINES_INCS
}
${
RUNTIME_INCS
}
${
IMAGE_INCS
}
${
CMAKE_BINARY_DIR
}
/json
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/sha256
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/services/graphdriver/devmapper
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../../src/services/graphdriver
...
...
@@ -45,4 +43,4 @@ target_include_directories(${EXE} PUBLIC
)
#set_target_properties(${EXE} PROPERTIES LINK_FLAGS)
target_link_libraries
(
${
EXE
}
${
GTEST_BOTH_LIBRARIES
}
${
GMOCK_LIBRARY
}
${
GMOCK_MAIN_LIBRARY
}
${
CMAKE_THREAD_LIBS_INIT
}
-lgrpc++ -lprotobuf -lcrypto -lyajl -lz
)
target_link_libraries
(
${
EXE
}
${
GTEST_BOTH_LIBRARIES
}
${
GMOCK_LIBRARY
}
${
GMOCK_MAIN_LIBRARY
}
${
CMAKE_THREAD_LIBS_INIT
}
${
ISULA_LIBUTILS_LIBRARY
}
-lgrpc++ -lprotobuf -lcrypto -lyajl -lz
)
test/specs/specs/CMakeLists.txt
浏览文件 @
14fe7d63
...
...
@@ -11,27 +11,17 @@ add_executable(${EXE}
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cutils/utils_convert.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cutils/utils_file.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cutils/util_atomic.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/log.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/sha256/sha256.c
${
CMAKE_BINARY_DIR
}
/json/json_common.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/path.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/map/map.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/map/rb_tree.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/services/execution/spec/specs.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/services/execution/spec/specs_mount.c
${
CMAKE_BINARY_DIR
}
/json/host_config.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/services/execution/spec/specs_extend.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/services/execution/spec/specs_security.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/libisulad.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/json/oci_runtime_hooks.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/json/parse_common.c
${
CMAKE_BINARY_DIR
}
/json/defs.c
${
CMAKE_BINARY_DIR
}
/json/container_config_v2.c
${
CMAKE_BINARY_DIR
}
/json/container_config.c
${
CMAKE_BINARY_DIR
}
/json/oci_runtime_spec.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/services/execution/spec/sysinfo.c
${
CMAKE_BINARY_DIR
}
/json/oci_runtime_config_linux.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cmd/commander.c
${
CMAKE_BINARY_DIR
}
/json/isulad_daemon_configs.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/json/schema/src/read_file.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cmd/isulad/arguments.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../test/image/oci/oci_llt_common.cc
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../test/mocks/containers_store_mock.cc
...
...
@@ -40,9 +30,6 @@ add_executable(${EXE}
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../test/mocks/engine_mock.cc
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../test/mocks/selinux_label_mock.cc
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../test/mocks/isulad_config_mock.cc
${
CMAKE_BINARY_DIR
}
/json/imagetool_image.c
${
CMAKE_BINARY_DIR
}
/json/oci_image_spec.c
${
CMAKE_BINARY_DIR
}
/json/docker_seccomp.c
specs_llt.cc
)
target_include_directories
(
${
EXE
}
PUBLIC
...
...
@@ -52,7 +39,6 @@ target_include_directories(${EXE} PUBLIC
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/image
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cutils
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/json
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/map
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/services
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/services/execution
...
...
@@ -68,17 +54,15 @@ target_include_directories(${EXE} PUBLIC
#${EXECUTION_INCS}
${
RUNTIME_INCS
}
${
IMAGE_INCS
}
${
CMAKE_BINARY_DIR
}
/json
${
CMAKE_BINARY_DIR
}
/conf
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/sha256
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/config
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cmd
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/services/graphdriver
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/json/schema/src
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/console
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../test/image/oci
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../test/mocks
)
#set_target_properties(${EXE} PROPERTIES LINK_FLAGS)
target_link_libraries
(
${
EXE
}
${
GTEST_BOTH_LIBRARIES
}
${
GMOCK_LIBRARY
}
${
GMOCK_MAIN_LIBRARY
}
${
CMAKE_THREAD_LIBS_INIT
}
-lgrpc++ -lprotobuf -lcrypto -lyajl -lz
)
target_link_libraries
(
${
EXE
}
${
GTEST_BOTH_LIBRARIES
}
${
GMOCK_LIBRARY
}
${
GMOCK_MAIN_LIBRARY
}
${
CMAKE_THREAD_LIBS_INIT
}
${
ISULA_LIBUTILS_LIBRARY
}
-lgrpc++ -lprotobuf -lcrypto -lyajl -lz
)
test/specs/specs/specs_llt.cc
浏览文件 @
14fe7d63
...
...
@@ -17,10 +17,10 @@
#include <stdio.h>
#include <gtest/gtest.h>
#include "mock.h"
#include "oci_runtime_spec.h"
#include "
isula_libutils/
oci_runtime_spec.h"
#include "specs.h"
#include "host_config.h"
#include "container_config.h"
#include "
isula_libutils/
host_config.h"
#include "
isula_libutils/
container_config.h"
#include "oci_llt_common.h"
#include <gtest/gtest.h>
#include <gmock/gmock.h>
...
...
test/specs/specs_extend/CMakeLists.txt
浏览文件 @
14fe7d63
...
...
@@ -11,27 +11,17 @@ add_executable(${EXE}
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cutils/utils_convert.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cutils/utils_file.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cutils/util_atomic.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/log.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/sha256/sha256.c
${
CMAKE_BINARY_DIR
}
/json/json_common.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/path.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/map/map.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/map/rb_tree.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/services/execution/spec/specs.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/services/execution/spec/specs_mount.c
${
CMAKE_BINARY_DIR
}
/json/host_config.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/services/execution/spec/specs_extend.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/services/execution/spec/specs_security.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/libisulad.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/json/oci_runtime_hooks.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/json/parse_common.c
${
CMAKE_BINARY_DIR
}
/json/defs.c
${
CMAKE_BINARY_DIR
}
/json/container_config_v2.c
${
CMAKE_BINARY_DIR
}
/json/container_config.c
${
CMAKE_BINARY_DIR
}
/json/oci_runtime_spec.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/services/execution/spec/sysinfo.c
${
CMAKE_BINARY_DIR
}
/json/oci_runtime_config_linux.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cmd/commander.c
${
CMAKE_BINARY_DIR
}
/json/isulad_daemon_configs.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/json/schema/src/read_file.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cmd/isulad/arguments.c
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../test/image/oci/oci_llt_common.cc
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../test/mocks/containers_store_mock.cc
...
...
@@ -40,9 +30,6 @@ add_executable(${EXE}
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../test/mocks/engine_mock.cc
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../test/mocks/selinux_label_mock.cc
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../test/mocks/isulad_config_mock.cc
${
CMAKE_BINARY_DIR
}
/json/imagetool_image.c
${
CMAKE_BINARY_DIR
}
/json/oci_image_spec.c
${
CMAKE_BINARY_DIR
}
/json/docker_seccomp.c
specs_extend_llt.cc
)
target_include_directories
(
${
EXE
}
PUBLIC
...
...
@@ -52,7 +39,6 @@ target_include_directories(${EXE} PUBLIC
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/image
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cutils
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/json
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/map
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/services
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/services/execution
...
...
@@ -67,16 +53,14 @@ target_include_directories(${EXE} PUBLIC
${
ENGINES_INCS
}
${
RUNTIME_INCS
}
${
IMAGE_INCS
}
${
CMAKE_BINARY_DIR
}
/json
${
CMAKE_BINARY_DIR
}
/conf
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/sha256
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/config
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/cmd
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/services/graphdriver
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/json/schema/src
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../src/console
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../test/image/oci
${
CMAKE_CURRENT_SOURCE_DIR
}
/../../../test/mocks
)
target_link_libraries
(
${
EXE
}
${
GTEST_BOTH_LIBRARIES
}
${
GMOCK_LIBRARY
}
${
GMOCK_MAIN_LIBRARY
}
${
CMAKE_THREAD_LIBS_INIT
}
-lgrpc++ -lprotobuf -lcrypto -lyajl -lz
)
target_link_libraries
(
${
EXE
}
${
GTEST_BOTH_LIBRARIES
}
${
GMOCK_LIBRARY
}
${
GMOCK_MAIN_LIBRARY
}
${
CMAKE_THREAD_LIBS_INIT
}
${
ISULA_LIBUTILS_LIBRARY
}
-lgrpc++ -lprotobuf -lcrypto -lyajl -lz
)
test/specs/specs_extend/specs_extend_llt.cc
浏览文件 @
14fe7d63
...
...
@@ -17,15 +17,15 @@
#include <stdio.h>
#include <gtest/gtest.h>
#include "mock.h"
#include "oci_runtime_spec.h"
#include "
isula_libutils/
oci_runtime_spec.h"
#include "specs.h"
#include "host_config.h"
#include "container_config.h"
#include "
isula_libutils/
host_config.h"
#include "
isula_libutils/
container_config.h"
#include "oci_llt_common.h"
#include <gtest/gtest.h>
#include <gmock/gmock.h>
#include "isulad_config_mock.h"
#include "oci_runtime_hooks.h"
#include "
isula_libutils/
oci_runtime_hooks.h"
#include "utils.h"
#include "specs_extend.h"
...
...
@@ -285,4 +285,4 @@ TEST(merge_hooks_llt, test_merge_hooks_llt_poststop)
hooks_spec
=
NULL
;
free_oci_runtime_spec
(
oci_spec
);
oci_spec
=
NULL
;
}
\ No newline at end of file
}
test/test.sh
浏览文件 @
14fe7d63
...
...
@@ -146,7 +146,7 @@ function llt_compile()
{
ret
=
0
echo
----------------------
llt compile begin
----------------------
make
-j
make
-j
${
nproc
}
ret
=
$?
echo
----------------------
llt compile end
------------------------
echo
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录