From 919e0141844f50903303bb04cf496558b58a3c97 Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Thu, 29 Jun 2023 14:14:43 +0100 Subject: Fix host logcat parsing after latest changes. The output has changed with: https://android-review.git.corp.google.com/q/topic:%22log_format%22 Test: test.py Bug: 287910948 Change-Id: I61a8ed63b0c0ff7dd297bb1a2fa1e96ed36502b0 --- test/default_run.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test/default_run.py') diff --git a/test/default_run.py b/test/default_run.py index c9dcb0ac29..7e28dfc082 100755 --- a/test/default_run.py +++ b/test/default_run.py @@ -982,11 +982,11 @@ def default_run(ctx, args, **kwargs): # In particular, unhandled exception is printed using several unterminated printfs. ALL_LOG_TAGS = ["V", "D", "I", "W", "E", "F", "S"] skip_tag_set = "|".join(ALL_LOG_TAGS[:ALL_LOG_TAGS.index(args.diff_min_log_tag.upper())]) - skip_reg_exp = fr'[[:alnum:]]+ ({skip_tag_set}) #-# #:#:# [^\n]*\n'.replace('#', '[0-9]+') + skip_reg_exp = fr'#-# #:#:# # # ({skip_tag_set}) [^\n]*\n'.replace('#', '[0-9.]+') ctx.run(fr"sed -i -z -E 's/{skip_reg_exp}//g' '{args.stderr_file}'") if not HAVE_IMAGE: message = "(Unable to open file|Could not create image space)" - ctx.run(fr"sed -i -E '/^dalvikvm(|32|64) E .* {message}/d' '{args.stderr_file}'") + ctx.run(fr"sed -i -E '/^.* E dalvikvm(|32|64): .* {message}/d' '{args.stderr_file}'") if ANDROID_LOG_TAGS != "*:i" and "D" in skip_tag_set: ctx.run(fr"sed -i -E '/^(Time zone|I18n) APEX ICU file found/d' '{args.stderr_file}'") if ON_VM: -- cgit v1.2.3-59-g8ed1b