From 9e36a2b613f5c93083b4f0aba5d5288546c57994 Mon Sep 17 00:00:00 2001 From: lizhengrong Date: Wed, 19 Jun 2024 21:06:43 +0800 Subject: [PATCH] Signed-off-by:lizhengrong --- localCoverage/automate_execute/build_part.py | 6 ++++-- src/core/driver/drivers.py | 7 +++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/localCoverage/automate_execute/build_part.py b/localCoverage/automate_execute/build_part.py index 85d798f..12c8497 100644 --- a/localCoverage/automate_execute/build_part.py +++ b/localCoverage/automate_execute/build_part.py @@ -64,12 +64,14 @@ def get_bundle_json(part_str, developer_path, code_path): if system_or_vendor == "system": command = ["./build_system.sh", "--abi-type", "generic_generic_arm_64only", "--device-type", "general_all_phone_standard", "--ccache", "--build-variant", "root"] - elif system_or_vendor == "system": + elif system_or_vendor == "vendor": command = ["./build_vendor.sh", "--abi-type", "generic_generic_arm_64only", "--device-type", "general_8425L_phone_standard", "--ccache", "--build-variant", "root", "--gn-args", "uefi_enable=true", "--gn-args", "USE_HM_KERNEL=true"] - else: + elif system_or_vendor == "blue": command = ["./build.sh", "--product-name", "rk3568", "--ccache"] + else: + return False if part_json.get(part_str): bundle_json_path = os.path.join(code_path, part_json[part_str]["path"][0], "bundle.json") diff --git a/src/core/driver/drivers.py b/src/core/driver/drivers.py index 4abdb10..c27b902 100644 --- a/src/core/driver/drivers.py +++ b/src/core/driver/drivers.py @@ -579,12 +579,19 @@ class CppTestDriver(IDriver): self._run_gtest(suite_file) finally: + log_path = get_result_savepath(request.root.source.source_file, request.config.report_path) + suit_name = os.path.basename(request.root.source.source_file) + xml_path = os.path.join(log_path, f"{suit_name}.xml") + if not os.path.exists(xml_path): + _create_empty_result_file(xml_path, suit_name, "ERROR") + update_xml(request.root.source.source_file, xml_path) serial = "{}_{}".format(str(request.config.device.__get_serial__()), time.time_ns()) log_tar_file_name = "{}_{}".format(request.get_module_name(), str(serial).replace( ":", "_")) self.config.device.device_log_collector.stop_hilog_task( log_tar_file_name, module_name=request.get_module_name()) + def _init_gtest(self): self.config.device.connector_command("target mount") self.config.device.execute_shell_command( -- Gitee