Extend temporary filtering pattern for ICU issue
Branches using ICU built from sources (rather than prebuilts) now have
a newline at the end of each ICU log entry.
Bug: 171770326
Bug: 171833701
Test: [master-art] art/test/run-test --host 001-HelloWorld
Test: [sc-release] art/test/run-test --host 001-HelloWorld
Change-Id: Ia84db0b84269e43d73d55e3240314c00057b77fb
diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar
index b23a572..865241c 100755
--- a/test/etc/run-test-jar
+++ b/test/etc/run-test-jar
@@ -1403,7 +1403,10 @@
# This temporary host only path is for ICU lazy initialization output (b/171770326).
# We are attempting to remove the ICU log entries that now happens lazily and go to
# stderr on host.
- $cmdline "$@" 2>&1 | sed -e 's/No timezone override.*icudt6[6-7]l.dat//'
+ $cmdline "$@" 2>&1 | sed -e '/^No timezone override.*icu_tzdata.dat$/d' \
+ -e '/^Time zone APEX ICU file found:.*icu_tzdata.dat$/d' \
+ -e '/^I18n APEX ICU file found: .*icudt6[6-7]l.dat$/d' \
+ -e 's/No timezone override.*icudt6[6-7]l.dat//'
exit_value=${PIPESTATUS[0]}
else
$cmdline "$@" 2>&1 & pid=$!