From a11e89240392d7756393488897d3ceba302c1999 Mon Sep 17 00:00:00 2001 From: lizhengrong Date: Sun, 11 Aug 2024 21:38:12 +0800 Subject: [PATCH 1/2] Signed-off-by:lizhengrong --- local_coverage/code_coverage/multiprocess_code_coverage.py | 7 +++++++ local_coverage/resident_service/init_gcov.py | 2 +- local_coverage/resident_service/pull_service_gcda.py | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/local_coverage/code_coverage/multiprocess_code_coverage.py b/local_coverage/code_coverage/multiprocess_code_coverage.py index 2c56cec..de0e989 100644 --- a/local_coverage/code_coverage/multiprocess_code_coverage.py +++ b/local_coverage/code_coverage/multiprocess_code_coverage.py @@ -217,6 +217,13 @@ def cut_info(subsystem, test_dir): cmd = "lcov --remove {} {} -o {}".format(trace_file, remove, output_name) execute_command(cmd) + delete_empty_info_file(output_name) + + +def delete_empty_info_file(filename): + if os.path.exists(filename) and os.stat(filename).st_size == 0: + print(f"empty file {filename} deleted") + os.remove(filename) def gen_info(cov_path, test_dir, subsystem_list, lcovrc_path): diff --git a/local_coverage/resident_service/init_gcov.py b/local_coverage/resident_service/init_gcov.py index fcbb020..e414e76 100644 --- a/local_coverage/resident_service/init_gcov.py +++ b/local_coverage/resident_service/init_gcov.py @@ -98,7 +98,7 @@ def modify_faultloggerd_file(developer_path, hdc_str): if os.path.exists(cfg_file_path): with open(cfg_file_path, "r") as fp: json_data = json.load(fp) - if json_data.get("jobs"): + if json_data.get("jobs") and json_data["jobs"][0]["name"] != "pre-init": json_data["jobs"].insert(0, { "name": "pre-init", "cmds": [ diff --git a/local_coverage/resident_service/pull_service_gcda.py b/local_coverage/resident_service/pull_service_gcda.py index f766732..d3f740f 100644 --- a/local_coverage/resident_service/pull_service_gcda.py +++ b/local_coverage/resident_service/pull_service_gcda.py @@ -108,8 +108,8 @@ def get_gcda_file(device_ip, device_sn, process_str, component_gcda_dict, coverage_command("tar -zxf %s -C %s > /dev/null 2>&1" % ( local_tar, local_gcda_path)) coverage_command("rm -rf %s" % local_tar) - print("%s shell rm -fr %s" % (hdc_str, f"/data/gcov{home_path}")) - coverage_command("%s shell rm -fr %s" % (hdc_str, f"/data/gcov{home_path}")) + print("%s shell rm -fr %s" % (hdc_str, f"/data/gcov{home_path}")) + coverage_command("%s shell rm -fr %s" % (hdc_str, f"/data/gcov{home_path}")) def get_service_list(device_ip, device_sn, system_info_dict, services_component_dict, -- Gitee From c526146a1409b6d9ec8038974ea68f5b472e798a Mon Sep 17 00:00:00 2001 From: lizhengrong Date: Mon, 12 Aug 2024 22:02:37 +0800 Subject: [PATCH 2/2] Signed-off-by:lizhengrong --- local_coverage/code_coverage/multiprocess_code_coverage.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/local_coverage/code_coverage/multiprocess_code_coverage.py b/local_coverage/code_coverage/multiprocess_code_coverage.py index de0e989..fc06b06 100644 --- a/local_coverage/code_coverage/multiprocess_code_coverage.py +++ b/local_coverage/code_coverage/multiprocess_code_coverage.py @@ -218,8 +218,8 @@ def cut_info(subsystem, test_dir): cmd = "lcov --remove {} {} -o {}".format(trace_file, remove, output_name) execute_command(cmd) delete_empty_info_file(output_name) - - + + def delete_empty_info_file(filename): if os.path.exists(filename) and os.stat(filename).st_size == 0: print(f"empty file {filename} deleted") -- Gitee