diff options
| author | 2023-06-29 14:14:43 +0100 | |
|---|---|---|
| committer | 2023-06-29 14:50:52 +0000 | |
| commit | 919e0141844f50903303bb04cf496558b58a3c97 (patch) | |
| tree | 807cbfd7654c4e8227243ad6a56169802358a9e8 | |
| parent | 3dfeb7dfd54aa0f4854bb69f799c75629ea1ebd9 (diff) | |
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
| -rw-r--r-- | test/099-vmdebug/run.py | 2 | ||||
| -rw-r--r-- | test/143-string-value/run.py | 2 | ||||
| -rwxr-xr-x | test/default_run.py | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/test/099-vmdebug/run.py b/test/099-vmdebug/run.py index 4492f3652f..e3eac8d806 100644 --- a/test/099-vmdebug/run.py +++ b/test/099-vmdebug/run.py @@ -19,4 +19,4 @@ def run(ctx, args): ctx.default_run(args) # Strip the process pids and line numbers from exact error messages. - ctx.run(fr"sed -i '/^.*dalvikvm\(\|32\|64\) E.*\] /d' '{args.stderr_file}'") + ctx.run(fr"sed -i '/^.* E dalvikvm\(\|32\|64\): .*/d' '{args.stderr_file}'") diff --git a/test/143-string-value/run.py b/test/143-string-value/run.py index 5f32b06fea..2680d57b83 100644 --- a/test/143-string-value/run.py +++ b/test/143-string-value/run.py @@ -19,4 +19,4 @@ def run(ctx, args): ctx.default_run(args) # Strip error log messages. - ctx.run(fr"sed -i '/^.*dalvikvm\(\|32\|64\) E.*\] /d' '{args.stderr_file}'") + ctx.run(fr"sed -i '/^.* E dalvikvm\(\|32\|64\): .*/d' '{args.stderr_file}'") 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: |