提交 686b2fed 编写于 作者: L laiguizhong

删除覆盖率脚本无效push动作,产品信息通过参数出入

Signed-off-by: Nlaiguizhong <laiguizhong@huawei.com>
Change-Id: I7a2c6d71183e8e62242521cbf67075f61d588f03
上级 af5c4fc8
...@@ -18,7 +18,8 @@ ...@@ -18,7 +18,8 @@
# path is the rootdir of ohos projects. # path is the rootdir of ohos projects.
if [ $# -lt 1 ];then if [ $# -lt 1 ];then
echo "Usage $0 <ohos project rootpath>" echo "Usage $0 <product name>"
echo "example $0 rk3568"
exit 1 exit 1
fi fi
...@@ -31,16 +32,30 @@ function hdc_shell_cmd() { ...@@ -31,16 +32,30 @@ function hdc_shell_cmd() {
hdc shell $@ hdc shell $@
} }
function hdc_push_cmd() { function get_root_dir() {
# do nothing if there are not any arguments local cur_path=$(pwd)
if [ $# -ne 2 ];then while [ "${cur_path}" != "" ]
return; do
fi cur_path=${cur_path%/*}
echo "Pushing resources to device" if [ "${cur_path}" == "" ];then
hdc file send $@ echo "[error] get code root dir fail"
sleep 0.2 exit 1
fi
if [ "$(basename ${cur_path})" == "base" ]; then
ohos_root=${cur_path%/*}
return
fi
done
} }
get_root_dir
product_name=$1
if [ ! -d "${ohos_root}/out/${product_name}" ]; then
echo "product ${product_name} not exist"
exit 1
fi
hdc target mount hdc target mount
sleep 0.2 sleep 0.2
hdc_shell_cmd "mount -o remount,rw /" hdc_shell_cmd "mount -o remount,rw /"
...@@ -54,33 +69,13 @@ hdc_shell_cmd "umask 022" ...@@ -54,33 +69,13 @@ hdc_shell_cmd "umask 022"
hdc_shell_cmd "mkdir -p ${ut_target_path}" hdc_shell_cmd "mkdir -p ${ut_target_path}"
hdc_shell_cmd "mkdir -p ${ut_target_path}/proc" hdc_shell_cmd "mkdir -p ${ut_target_path}/proc"
ohos_init="${ohos_root}/base/startup"
ohos_root="$1"
ohos_root=${ohos_root%%/}
ohos_init="${ohos_root}/base/startup/init_lite"
hdc_shell_cmd "mkdir -p ${ut_target_path}/coverage" hdc_shell_cmd "mkdir -p ${ut_target_path}/coverage"
sleep 0.25 sleep 0.25
# copy file to test # copy file to test
hdc_shell_cmd "mkdir -p ${ut_target_path}/system" hdc file send ${ohos_root}/out/${product_name}/tests/unittest/startup/init/init_unittest /data/init_ut/init_unittest
hdc_shell_cmd "mkdir -p ${ut_target_path}/system/etc"
hdc_shell_cmd "mkdir -p ${ut_target_path}/system/etc/param"
hdc_shell_cmd "mkdir -p ${ut_target_path}/system/etc/param/ohos_const"
hdc_shell_cmd "mkdir -p ${ut_target_path}/vendor"
hdc_shell_cmd "mkdir -p ${ut_target_path}/vendor/etc"
hdc_shell_cmd "mkdir -p ${ut_target_path}/vendor/etc/param"
hdc_shell_cmd "cp ${ohos_root}/base/startup/init_lite/test/unittest/test_data/system/etc/param/ohos_const/* ${ut_target_path}/system/etc/param/ohos_const/"
hdc_push_cmd ${ohos_root}/base/startup/init_lite/test/unittest/test_data/system/etc/param/ohos.para ${ut_target_path}/system/etc/param/ohos.para
hdc_push_cmd ${ohos_root}/base/startup/init_lite/test/unittest/test_data/system/etc/param/ohos.para.dac ${ut_target_path}/system/etc/param/ohos.para.dac
hdc_push_cmd ${ohos_root}/base/startup/init_lite/test/unittest/test_data/system/etc/param/ohos.para.selinux ${ut_target_path}/system/etc/param/ohos.para.selinux
hdc_push_cmd ${ohos_root}/base/startup/init_lite/test/unittest/test_data/trigger_test.cfg /data/init_ut/trigger_test.cfg
sleep 0.2
hdc_push_cmd ${ohos_root}/base/startup/init_lite/test/unittest/test_data/proc/cmdline /data/init_ut/proc/cmdline
sleep 0.25
hdc file send ${ohos_root}/out/rk3568/tests/unittest/startup/init/init_unittest /data/init_ut/init_unittest
sleep 0.25 sleep 0.25
hdc_shell_cmd "cp /data/init_ut/init_unittest /bin/init_unittest" hdc_shell_cmd "cp /data/init_ut/init_unittest /bin/init_unittest"
...@@ -109,7 +104,7 @@ done ...@@ -109,7 +104,7 @@ done
echo "Find out all gcno files and copy to ${ohos_init}" echo "Find out all gcno files and copy to ${ohos_init}"
find ${ohos_root}/out/rk3568/obj/base/startup/ -name "*.gcno" -type f -exec cp {} . \; find ${ohos_root}/out/${product_name}/obj/base/startup/ -name "*.gcno" -type f -exec cp {} . \;
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "find gcno failed." echo "find gcno failed."
popd 2>&1 > /dev/null popd 2>&1 > /dev/null
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册