ART: Silence some run-test configurations
Run-tests running with a failing dex2oat or patchoat are expected
to print error lines of the failure. In this case set the log-level
to FATAL-only, as stripping those errors is overly complicated.
Bug: 18713034
Change-Id: If9c5f50b517b5e906dd0be841ebc1e7987cac928
diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar
index 0c49674..f64756b 100755
--- a/test/etc/run-test-jar
+++ b/test/etc/run-test-jar
@@ -44,6 +44,7 @@
VERIFY="y"
ZYGOTE=""
DEX_VERIFY=""
+USE_DEX2OAT_AND_PATCHOAT="y"
while true; do
if [ "x$1" = "x--quiet" ]; then
@@ -74,9 +75,11 @@
shift
elif [ "x$1" = "x--no-dex2oat" ]; then
DEX2OAT="-Xcompiler:${FALSE_BIN}"
+ USE_DEX2OAT_AND_PATCHOAT="n"
shift
elif [ "x$1" = "x--no-patchoat" ]; then
PATCHOAT="-Xpatchoat:${FALSE_BIN}"
+ USE_DEX2OAT_AND_PATCHOAT="n"
shift
elif [ "x$1" = "x--relocate" ]; then
RELOCATE="y"
@@ -369,7 +372,12 @@
export ANDROID_PRINTF_LOG=brief
if [ "$DEV_MODE" = "y" ]; then
export ANDROID_LOG_TAGS='*:d'
+ elif [ "$USE_DEX2OAT_AND_PATCHOAT" = "n" ]; then
+ # All tests would log the error of failing dex2oat/patchoat. Be silent here and only
+ # log fatal events. This is the old default.
+ export ANDROID_LOG_TAGS='*:s'
else
+ # We are interested in LOG(ERROR) output.
export ANDROID_LOG_TAGS='*:e'
fi
export ANDROID_DATA="$DEX_LOCATION"