Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openeuler
iSulad
提交
2c1805e2
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,发现更多精彩内容 >>
提交
2c1805e2
编写于
8月 22, 2020
作者:
W
wujing
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
merge unit and function testcases coverage
Signed-off-by:
N
wujing
<
wujing50@huawei.com
>
上级
cdebb590
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
14 addition
and
51 deletion
+14
-51
CI/build.sh
CI/build.sh
+0
-7
CI/generate_gcov.sh
CI/generate_gcov.sh
+8
-24
CI/make-and-install.sh
CI/make-and-install.sh
+6
-20
未找到文件。
CI/build.sh
浏览文件 @
2c1805e2
...
...
@@ -456,13 +456,6 @@ if [[ "x${enable_gcov}" == "xON" ]]; then
mv
./tmp/isulad-gcov /var/www/html/isulad-gcov
cp
isulad-gcov.tar.gz /var/www/html
rm
-rf
./tmp
tar
xf ./isulad-llt-gcov.tar.gz
rm
-rf
/var/www/html/isulad-llt-gcov
rm
-rf
/var/www/html/isulad-llt-gcov.tar.gz
mv
./coverage /var/www/html/isulad-llt-gcov
cp
isulad-llt-gcov.tar.gz /var/www/html
rm
-rf
./coverage
fi
if
[[
-e
$CIDIR
/
${
CONTAINER_NAME
}
.runflag
]]
;
then
...
...
CI/generate_gcov.sh
浏览文件 @
2c1805e2
...
...
@@ -26,32 +26,16 @@ echo "================================Generate GCOV data========================
echo
"*****************Get iSulad GCOV data**************************"
cp
-r
~/build
$ISULAD_COPY_PATH
cd
$ISULAD_COPY_PATH
/build/src/CMakeFiles
lcov
-c
-o
isulad.info
-d
isulad.dir
lcov
-c
-o
isula.info
-d
isula.dir
lcov
-c
-o
isulad-shim.info
-d
isulad-shim.dir
lcov
-c
-o
libisula.info
-d
libisula.dir
# Remove std files
lcov
--remove
isulad.info
'/usr/*'
-o
isulad.info
lcov
--remove
isula.info
'/usr/*'
-o
isula.info
lcov
--remove
isulad-shim.info
'/usr/*'
-o
isulad-shim.info
lcov
--remove
libisula.info
'/usr/*'
-o
libisula.info
# Generate html
genhtml
--ignore-errors
source
-o
$GCOV_RESULT_PATH
/isulad isulad.info
genhtml
--ignore-errors
source
-o
$GCOV_RESULT_PATH
/isula isula.info
genhtml
--ignore-errors
source
-o
$GCOV_RESULT_PATH
/isulad-shim isulad-shim.info
genhtml
--ignore-errors
source
-o
$GCOV_RESULT_PATH
/libisula libisula.info
cd
$ISULAD_COPY_PATH
/build/src/utils/http/CMakeFiles
lcov
-c
-o
libhttpclient.info
'/usr/*'
-o
libhttpclient.info
# Remove std file
lcov
--remove
libhttpclient.info
'/usr/*'
-o
libhttpclient.info
cd
$ISULAD_COPY_PATH
/build
ctest
lcov
--directory
.
--capture
--output-file
coverage.info
# Remove std/build files
lcov
--remove
coverage.info
'/usr/*'
-o
coverage.info
lcov
--remove
coverage.info
'build/*'
-o
coverage.info
lcov
--remove
coverage.info
'test/*'
-o
coverage.info
# Generate html
genhtml
--ignore-errors
source
-o
$GCOV_RESULT_PATH
/
libhttpclient libhttpclient
.info
genhtml
--ignore-errors
source
-o
$GCOV_RESULT_PATH
/
coverage coverage
.info
tar
-zcf
$ISULAD_SRC_PATH
/isulad-gcov.tar.gz
$GCOV_RESULT_PATH
...
...
CI/make-and-install.sh
浏览文件 @
2c1805e2
...
...
@@ -72,28 +72,14 @@ cd $ISULAD_COPY_PATH
sed
-i
's/fd == STDIN_FILENO || fd == STDOUT_FILENO || fd == STDERR_FILENO/fd == 0 || fd == 1 || fd == 2 || fd >= 1000/g'
./src/utils/cutils/utils.c
rm
-rf
build
mkdir
build
&&
cd
build
if
[[
"x
${
GCOV
}
"
==
"xON"
]]
;
then
cmake
-DCMAKE_BUILD_TYPE
=
Debug
-DENABLE_COVERAGE
=
ON
-DENABLE_UT
=
ON ..
make
-j
$(
nproc
)
ctest
-T
memcheck
--output-on-failure
if
[[
$?
-ne
0
]]
;
then
exit
1
fi
make coverage
ISULAD_SRC_PATH
=
$(
env
|
grep
TOPDIR |
awk
-F
=
'{print $2}'
)
tar
-zcf
$ISULAD_SRC_PATH
/isulad-llt-gcov.tar.gz ./test/coverage/
else
cmake
-DCMAKE_BUILD_TYPE
=
Debug
-DENABLE_UT
=
ON ..
make
-j
$(
nproc
)
ctest
-T
memcheck
--output-on-failure
if
[[
$?
-ne
0
]]
;
then
exit
1
fi
cmake
-DCMAKE_BUILD_TYPE
=
Debug
-DENABLE_UT
=
ON ..
make
-j
$(
nproc
)
ctest
-T
memcheck
--output-on-failure
if
[[
$?
-ne
0
]]
;
then
exit
1
fi
echo_success
"===================RUN DT-LLT TESTCASES END========================="
cd
$ISULAD_COPY_PATH
# build rest version
cd
$ISULAD_COPY_PATH
rm
-rf
build
...
...
@@ -111,7 +97,7 @@ rm -rf build
mkdir
build
cd
build
if
[[
${
enable_gcov
}
-ne
0
]]
;
then
cmake
-DLIB_INSTALL_DIR
=
${
builddir
}
/lib
-DCMAKE_INSTALL_PREFIX
=
${
builddir
}
-DCMAKE_INSTALL_SYSCONFDIR
=
${
builddir
}
/etc
-DCMAKE_BUILD_TYPE
=
debug
-DGCOV
=
ON
-DENABLE_EMBEDDED
=
ON ..
cmake
-DLIB_INSTALL_DIR
=
${
builddir
}
/lib
-DCMAKE_INSTALL_PREFIX
=
${
builddir
}
-DCMAKE_INSTALL_SYSCONFDIR
=
${
builddir
}
/etc
-DCMAKE_BUILD_TYPE
=
Debug
-DGCOV
=
ON
-DENABLE_EMBEDDED
=
ON
-DENABLE_COVERAGE
=
ON
-DENABLE_UT
=
ON ..
else
cmake
-DLIB_INSTALL_DIR
=
${
builddir
}
/lib
-DCMAKE_INSTALL_PREFIX
=
${
builddir
}
-DCMAKE_INSTALL_SYSCONFDIR
=
${
builddir
}
/etc
-DENABLE_EMBEDDED
=
ON ..
fi
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录