diff --git a/README_zh.md b/README_zh.md
index b18822df96a9e80dd9235f8e801daecc941652f0..4d685764b217ff1996e27126a2503b3063fa6e77 100755
--- a/README_zh.md
+++ b/README_zh.md
@@ -868,6 +868,12 @@ subsystem # 子系统
```
+ >**说明:**若某些push上去的二进制文件需要增量生成数据字典,则新增一行:
+ ```
+
+ // 例如
+
+ ```
3. 在测试用例的编译配置文件中定义resource_config_file进行指引,用来指定对应的资源文件ohos_test.xml
```
ohos_unittest("CalculatorSubTest") {
diff --git a/install.sh b/install.sh
index 86c05c766c27e2aaae7367c9cc82bf1e7ec86d83..d74380b0937900ddf221d02349bbd97ad468c25a 100755
--- a/install.sh
+++ b/install.sh
@@ -1,4 +1,4 @@
-#! /bin/bash
+#!/bin/bash
#
# Copyright (c) 2022 Huawei Device Co., Ltd.
# Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/localCoverage/interfaceCoverage/interfaceCoverage_gcov_lcov.py b/localCoverage/interfaceCoverage/interfaceCoverage_gcov_lcov.py
index 86a7c8052fd114b75ba196aebfcb148d625ff28d..f9444bbad8c7efe73932015a3fd7ce43562d8ccb 100644
--- a/localCoverage/interfaceCoverage/interfaceCoverage_gcov_lcov.py
+++ b/localCoverage/interfaceCoverage/interfaceCoverage_gcov_lcov.py
@@ -304,13 +304,13 @@ def get_covered_result_data(public_interface_func_list, covered_func_list):
para_list = data_list[3]
return_val = data_list[4]
para_string = ""
+ new_list = []
for index in range(len(para_list)):
if para_list[index].strip() == "":
continue
curr_para = para_list[index]
- para_string += curr_para
- if index < len(para_list) - 1:
- para_string += ", "
+ new_list.appned(curr_para)
+ para_string = ",".join(new_list)
fun_string = f"{return_val}' '{func_name}({para_string.strip().strip(',')})"
fun_string = fun_string.strip()
fun_string = filter_para_sub_string(fun_string)
diff --git a/localCoverage/interfaceCoverage/make_report.py b/localCoverage/interfaceCoverage/make_report.py
index b340b6a65fa2328b79dd60b2bafe6bf3603eb06f..7195842047579904b61b59d5589a87b23702a1ed 100644
--- a/localCoverage/interfaceCoverage/make_report.py
+++ b/localCoverage/interfaceCoverage/make_report.py
@@ -125,7 +125,7 @@ def create_title(reportpath, title_name, summary_list):
for item in summary_list:
subsystem = item[0]
if count < 3:
- subsystems = subsystems + "、" + subsystem
+ subsystems = "%s、%s" % (subsystems, subsystem)
count = count + 1
if subsystem == "Summary":
nocoverd = item[1] - item[2]
diff --git a/localCoverage/push_coverage_so/push_coverage.py b/localCoverage/push_coverage_so/push_coverage.py
index 579801938f621cb6057dd314e0b821ae700cfad1..7e5c5c83a74191798e64191fd4da71fe98fef91d 100644
--- a/localCoverage/push_coverage_so/push_coverage.py
+++ b/localCoverage/push_coverage_so/push_coverage.py
@@ -118,7 +118,8 @@ def find_so_source_dest(path: str, subsystem_name: str) -> dict:
source_path = os.path.join(out_path, json_obj["source"])
if source_path.endswith(".so"):
- so_dict[source_path] = [tmp for tmp in json_obj["dest"] if tmp.startswith("system/")]
+ so_dict[source_path] = [tmp for tmp in json_obj["dest"] if (
+ tmp.startswith("system/") or tmp.startswith("vendor/"))]
return so_dict
diff --git a/localCoverage/resident_service/resources/gcov_flush.sh b/localCoverage/resident_service/resources/gcov_flush.sh
index 90a78cebcae317466c256be66d725555ba64f7b1..5cf0fada95d67e625e06ef9315dc394f8b8ec573 100644
--- a/localCoverage/resident_service/resources/gcov_flush.sh
+++ b/localCoverage/resident_service/resources/gcov_flush.sh
@@ -16,6 +16,6 @@
SERVER_NAME=$1
-ip_addrs=$(pgrep -f $SERVER_NAME)
+ip_addrs=$(pgrep -f $SERVER_NAME | head -n 1)
echo $ip_addrs
kill -SIGTTIN $ip_addrs
\ No newline at end of file
diff --git a/localCoverage/restore_comment/build_before_generate.py b/localCoverage/restore_comment/build_before_generate.py
index dd266b191506ac4d7340b12fa3d3a907a0c50f14..6a4cb34e87ae4cae489e4ecc2bce110c29803b99 100644
--- a/localCoverage/restore_comment/build_before_generate.py
+++ b/localCoverage/restore_comment/build_before_generate.py
@@ -68,7 +68,7 @@ def rewrite_source_file(source_path_list: list):
break
elif " //LCOV_EXCL_BR_LINE" not in line and not line.strip().endswith("\\") \
and sign_number == len(keys):
- write_fp.write(line.strip("\n").strip("\n\r") + " //LCOV_EXCL_BR_LINE")
+ write_fp.write("%s //LCOV_EXCL_BR_LINE" % line.strip("\n").strip("\n\r"))
write_fp.write("\n")
break
elif sign_number == len(keys):
diff --git a/src/core/driver/drivers.py b/src/core/driver/drivers.py
index f8595103ebad573cc26384eac6a0f7de372075eb..f31e36714237d14af6ef57ede4708c7d0f154b34 100644
--- a/src/core/driver/drivers.py
+++ b/src/core/driver/drivers.py
@@ -506,6 +506,8 @@ class ResultManager(object):
if self.is_exist_target_in_device(DEFAULT_TEST_PATH, target_name):
if not os.path.exists(cxx_cov_path):
os.makedirs(cxx_cov_path)
+ else:
+ cxx_cov_path = cxx_cov_path + f"_{str(int(time.time()))}"
self.config.device.execute_shell_command(
"cd %s; tar -czf %s.tar.gz %s" % (DEFAULT_TEST_PATH, target_name, target_name))
src_file_tar = os.path.join(DEFAULT_TEST_PATH, "%s.tar.gz" % target_name)