From 8a9fdfa81812d837248342c2a778d0012325297c Mon Sep 17 00:00:00 2001 From: Teacher_Dong Date: Thu, 11 Jan 2024 18:42:46 +0800 Subject: [PATCH] Signed-off-by:Teacher_Dong --- localCoverage/push_coverage_so/push_coverage.py | 2 +- src/core/driver/drivers.py | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/localCoverage/push_coverage_so/push_coverage.py b/localCoverage/push_coverage_so/push_coverage.py index 0aa9663..5798019 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] = json_obj["dest"] + so_dict[source_path] = [tmp for tmp in json_obj["dest"] if tmp.startswith("system/")] return so_dict diff --git a/src/core/driver/drivers.py b/src/core/driver/drivers.py index 9da4366..c3fe553 100644 --- a/src/core/driver/drivers.py +++ b/src/core/driver/drivers.py @@ -46,6 +46,7 @@ from core.utils import get_decode from core.utils import get_fuzzer_path from core.config.resource_manager import ResourceManager from core.config.config_manager import FuzzerConfigManager +import xml.etree.ElementTree as ET __all__ = [ "CppTestDriver", @@ -175,6 +176,16 @@ def get_test_log_savepath(result_rootpath, result_suit_path): return test_log_path +def update_xml(suite_file, result_xml): + suite_path_txt = suite_file.split(".")[0] + "_path.txt" + if os.path.exists(suite_path_txt) and os.path.exists(result_xml): + with open(suite_path_txt, "r") as path_text: + line = path_text.readline().replace("//", "").strip() + tree = ET.parse(result_xml) + tree.getroot().attrib["path"] = line + tree.write(result_xml) + + # all testsuit common Unavailable test result xml def _create_empty_result_file(filepath, filename, error_message): error_message = str(error_message) @@ -685,6 +696,7 @@ class CppTestDriver(IDriver): self.result = result.get_test_results_hidelog(return_message) else: self.result = result.get_test_results(return_message) + update_xml(suite_file, self.result) resource_manager.process_cleaner_data(resource_data_dic, resource_dir, @@ -872,6 +884,7 @@ class JSUnitTestDriver(IDriver): request.config.report_path, "result", '.'.join((request.get_module_name(), "xml"))) shutil.move(xml_path, self.result) + update_xml(suite_file, self.result) finally: self.config.device.device_log_collector.remove_log_address(None, self.hilog) self.config.device.device_log_collector.stop_catch_device_log(self.hilog_proc) @@ -1204,6 +1217,8 @@ class OHRustTestDriver(IDriver): result_save_path = get_result_savepath( request.root.source.source_file, self.config.report_path) shutil.move(self.result, result_save_path) + update_xml(request.root.source.source_file, + os.path.join(result_save_path, os.path.basename(self.result))) def _init_oh_rust(self): -- Gitee