Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb210fb5 authored by Shiu Ng's avatar Shiu Ng Committed by Automerger Merge Worker
Browse files

Merge "Set the coverage data (.profdata, .json, .txt) to be aggregated in... 

Merge "Set the coverage data (.profdata, .json, .txt) to be aggregated in mobly/logs/* to allow aggregation across test runs (as is executed for GD-cert presubmit)." am: a4496a3c am: 5a0b3e3e am: 314eb832

Original change: https://android-review.googlesource.com/c/platform/system/bt/+/1875587

Change-Id: Iae37b86a37333166af12a48fbc110f73859216a0
parents a430c7b5 314eb832

system/gd/cert/gd_device_lib.py

+3 −3
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ class GdDeviceBaseCore(ABC): 




def get_coverage_profdata_path_for_host(test_runner_base_path, type_identifier, label) -> pathlib.Path:

    return pathlib.Path(test_runner_base_path).parent.joinpath(

    return pathlib.Path(test_runner_base_path).parent.parent.joinpath(

        "%s_%s_backing_process_coverage.profdata" % (type_identifier, label))
@@ -294,7 +294,7 @@ def generate_coverage_report_for_host(coverage_info): 
        logging.info("[%s] Skip coverage report as llvm-cov is not found at %s" % (label, str(llvm_cov)))

        return

    logging.info("[%s] Generating coverage report in JSON" % label)

    coverage_result_path = pathlib.Path(test_runner_base_path).parent.joinpath(

    coverage_result_path = pathlib.Path(test_runner_base_path).parent.parent.joinpath(

        "%s_%s_backing_process_coverage.json" % (type_identifier, label))

    with coverage_result_path.open("w") as coverage_result_file:

        llvm_cov_export_cmd = [
@@ -310,7 +310,7 @@ def generate_coverage_report_for_host(coverage_info): 
        coverage_result_path.unlink(missing_ok=True)

        return

    logging.info("[%s] Generating coverage summary in text" % label)

    coverage_summary_path = pathlib.Path(test_runner_base_path).parent.joinpath(

    coverage_summary_path = pathlib.Path(test_runner_base_path).parent.parent.joinpath(

        "%s_%s_backing_process_coverage_summary.txt" % (type_identifier, label))

    with coverage_summary_path.open("w") as coverage_summary_file:

        llvm_cov_report_cmd = [