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

Commit 5b2f23bb authored by Julien Desprez's avatar Julien Desprez Committed by Automerger Merge Worker
Browse files

Merge "Fix crash when failing to parse test discovery output" into main am: ba8b8674 

Original change: https://android-review.googlesource.com/c/platform/build/+/3392523



Change-Id: I3973a5cbca5568c25eae037112fe793d7eb3e6b0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 4ce96565 ba8b8674

ci/build_test_suites.py

+8 −5
Original line number Diff line number Diff line
@@ -87,11 +87,14 @@ class BuildPlanner: 
      if optimization_rationale:

        get_metrics_agent().report_unoptimized_target(target, optimization_rationale)

      else:

        try:

          regex = r'\b(%s)\b' % re.escape(target)

          if any(re.search(regex, opt) for opt in test_discovery_zip_regexes):

            get_metrics_agent().report_unoptimized_target(target, 'Test artifact used.')

          else:

            get_metrics_agent().report_optimized_target(target)

        except Exception as e:

          logging.error(f'unable to parse test discovery output: {repr(e)}')



      if self._unused_target_exclusion_enabled(

          target