From 58428751afb596b79bab9198f7218b68819e60c8 Mon Sep 17 00:00:00 2001
From: lizhengrong <lizhengrong9@huawei.com>
Date: Mon, 6 May 2024 22:46:10 +0800
Subject: [PATCH 1/2] Signed-off-by:lizhengrong<lizhengrong9@huawei.com>

---
 README_zh.md                                                | 6 ++++++
 install.sh                                                  | 2 +-
 .../interfaceCoverage/interfaceCoverage_gcov_lcov.py        | 6 +++---
 localCoverage/interfaceCoverage/make_report.py              | 2 +-
 localCoverage/push_coverage_so/push_coverage.py             | 2 +-
 localCoverage/resident_service/resources/gcov_flush.sh      | 2 +-
 localCoverage/restore_comment/build_before_generate.py      | 2 +-
 src/core/driver/drivers.py                                  | 2 ++
 8 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/README_zh.md b/README_zh.md
index b18822d..ff74fa9 100755
--- a/README_zh.md
+++ b/README_zh.md
@@ -868,6 +868,12 @@ subsystem  # 子系统
 	    </target>
 	</configuration>
 	```
+	>**说明：**若某些push上去的二进制文件需要增量生成数据字典，则新增一行：
+	```
+    <option name="shell" value="hilog -d /设备中的二进制文件路径"/>
+    // 例如
+    <option name="shell" value="hilog -d /data/test/resource/libc++.z.so"/>
+	```
 3. 在测试用例的编译配置文件中定义resource_config_file进行指引，用来指定对应的资源文件ohos_test.xml
 	```
 	ohos_unittest("CalculatorSubTest") {
diff --git a/install.sh b/install.sh
index 86c05c7..d74380b 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 86a7c80..f9444bb 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 b340b6a..7195842 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 5798019..25fbc4c 100644
--- a/localCoverage/push_coverage_so/push_coverage.py
+++ b/localCoverage/push_coverage_so/push_coverage.py
@@ -118,7 +118,7 @@ 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 90a78ce..5cf0fad 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 dd266b1..6a4cb34 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 f859510..f31e367 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)
-- 
Gitee


From 2ade7de7b0dccb11c04d6656ec192b0ac8022d78 Mon Sep 17 00:00:00 2001
From: lizhengrong <lizhengrong9@huawei.com>
Date: Tue, 7 May 2024 21:23:39 +0800
Subject: [PATCH 2/2] Signed-off-by:lizhengrong<lizhengrong9@huawei.com>

---
 README_zh.md                                    | 2 +-
 localCoverage/push_coverage_so/push_coverage.py | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/README_zh.md b/README_zh.md
index ff74fa9..4d68576 100755
--- a/README_zh.md
+++ b/README_zh.md
@@ -872,7 +872,7 @@ subsystem  # 子系统
 	```
     <option name="shell" value="hilog -d /设备中的二进制文件路径"/>
     // 例如
-    <option name="shell" value="hilog -d /data/test/resource/libc++.z.so"/>
+    <option name="shell" value="hilog -d /data/test/resource/test.z.so"/>
 	```
 3. 在测试用例的编译配置文件中定义resource_config_file进行指引，用来指定对应的资源文件ohos_test.xml
 	```
diff --git a/localCoverage/push_coverage_so/push_coverage.py b/localCoverage/push_coverage_so/push_coverage.py
index 25fbc4c..7e5c5c8 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/") or tmp.startswith("vendor/"))]
+            so_dict[source_path] = [tmp for tmp in json_obj["dest"] if (
+                    tmp.startswith("system/") or tmp.startswith("vendor/"))]
 
     return so_dict
 
-- 
Gitee