summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Nicolas Geoffray <ngeoffray@google.com> 2016-11-03 17:17:30 +0000
committer android-build-merger <android-build-merger@google.com> 2016-11-03 17:17:30 +0000
commitcfeefce1b8bfa93cb5a6b6f93bae80e01f67133f (patch)
tree34d33245ba90b2e951719c292c2f93e0e43fe61b
parenta5c13e7f83638576a33ac1b3a26f41073977ee26 (diff)
parent74a96e45455878d7891941ec17c7c92d3e90572c (diff)
Merge "Output more for "Unable to determine architecture"."
am: 74a96e4545 Change-Id: I57f79d78b2e253ef4c9c69cf6fe08561e681f3aa
-rwxr-xr-xtest/etc/run-test-jar4
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)