diff --git a/local_coverage/code_coverage/multiprocess_code_coverage.py b/local_coverage/code_coverage/multiprocess_code_coverage.py index 2c56cecb907f3604ae0b138d678c4726ad70dfa1..fc06b06f2ed6ee06eecd89feb4ee4253c8c7d725 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 fcbb020e14b2d493b337aa72dfa9a0325ea31ed7..e414e7636d1747424b2307f3397da0f72ca4ef38 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 f7667320007c496a12e1a4a89c943f0595c27ea1..d3f740f2f784c02f3a6fa380243ba70e1d46d1d6 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,