commit c46e708aa0bd7a007f0de8db1cad8ef49166ca10
author Roland Levillain <rpl@google.com> Fri Nov 04 16:35:07 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Nov 04 16:35:08 2016 +0000
tree 10858d858ac0bc9371d5a756099fbaae23872745
parent 0b3e72e56e470efab18f1e80e548fce94349d5e5
parent 7fa7cf59540f36fbfce6d5b553d11ca486a3f207

Merge "Fix ART run-test 562-no-intermediate."

test/etc/run-test-jar

diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar
index 8ee4ca2..c525b2b 100755
--- a/test/etc/run-test-jar
+++ b/test/etc/run-test-jar
@@ -397,14 +397,26 @@
 fi
 
 if [ "$HOST" = "n" ]; then
-  adb_invocation=$(adb shell ls -F /data/dalvik-cache)
-  outcome=$?
-  ISA=$(echo $adb_invocation | grep -Ewo "${ARCHITECTURES_PATTERN}")
+  # Need to be root to query /data/dalvik-cache
+  adb root > /dev/null
+  adb wait-for-device
+  ISA=
+  ISA_adb_invocation=
+  ISA_outcome=
+  # We iterate a few times to workaround an adb issue. b/32655576
+  for i in {1..10}; do
+    ISA_adb_invocation=$(adb shell ls -F /data/dalvik-cache)
+    ISA_outcome=$?
+    ISA=$(echo $ISA_adb_invocation | grep -Ewo "${ARCHITECTURES_PATTERN}")
+    if [ x"$ISA" != "x" ]; then
+      break;
+    fi
+  done
   if [ x"$ISA" = "x" ]; then
     echo "Unable to determine architecture"
     # Print a few things for helping diagnosing the problem.
-    echo "adb invocation output: $adb_invocation"
-    echo "adb invocation outcome: $outcome"
+    echo "adb invocation output: $ISA_adb_invocation"
+    echo "adb invocation outcome: $ISA_outcome"
     echo $(adb shell ls -F /data/dalvik-cache)
     echo $(adb shell ls /data/dalvik-cache)
     echo ${ARCHITECTURES_PATTERN}