Merge "Output more for "Unable to determine architecture"."

1 files changed, 3 insertions, 1 deletions

diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar
index cf8db151fe..8ee4ca2873 100755
--- a/test/etc/run-test-jar
+++ b/test/etc/run-test-jar
@@ -397,11 +397,13 @@ else
 fi
 
 if [ "$HOST" = "n" ]; then
-  ISA=$(adb shell ls -F /data/dalvik-cache | grep -Ewo "${ARCHITECTURES_PATTERN}")
+  adb_invocation=$(adb shell ls -F /data/dalvik-cache)
   outcome=$?
+  ISA=$(echo $adb_invocation | grep -Ewo "${ARCHITECTURES_PATTERN}")
   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 shell ls -F /data/dalvik-cache)
     echo $(adb shell ls /data/dalvik-cache)