AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add more detailed logging when things go wrong in android_run_skia

Browse Source 
R=borenet@google.com, halcanary@google.com

Author: djsollen@google.com

Review URL: https://codereview.chromium.org/263733006

git-svn-id: http://skia.googlecode.com/svn/trunk@14513 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
commit-bot@chromium.org 2014-05-01 19:30:35 +00:00
parent 658e59507d
commit 123f3d74e3
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
platform_tools/android/bin/android_run_skia
View File

@ -24,10 +24,23 @@ STATUS_FILENAME="/data/local/tmp/.skia_tmp_$(date +%s%N)"
$ADB ${DEVICE_SERIAL} shell \ $ADB ${DEVICE_SERIAL} shell \
"/data/local/tmp/skia_launcher ${APP_ARGS[@]}; echo \$? > ${STATUS_FILENAME}" "/data/local/tmp/skia_launcher ${APP_ARGS[@]}; echo \$? > ${STATUS_FILENAME}"
if [ -z "$($ADB $DEVICE_SERIAL shell 'if [ -f $STATUS_FILENAME ]; then echo exists; fi')" ]; then if [ -z "$($ADB $DEVICE_SERIAL shell 'if [ -f $STATUS_FILENAME ]; then echo exists; fi')" ]; then
echo "***********************************************************************"
echo "The application terminated unexpectedly and did not produce an exit code"
echo "***********************************************************************"
exit 1 exit 1
fi fi
EXIT_CODE=`$ADB ${DEVICE_SERIAL} shell cat ${STATUS_FILENAME}` EXIT_CODE=`$ADB ${DEVICE_SERIAL} shell cat ${STATUS_FILENAME}`
$ADB ${DEVICE_SERIAL} shell rm ${STATUS_FILENAME} $ADB ${DEVICE_SERIAL} shell rm -f ${STATUS_FILENAME}
# check to see if the 'cat' command failed and print errors accordingly
if [[ ${EXIT_CODE} == *${STATUS_FILENAME}* ]]; then
echo "***********************************************************************"
echo "ADB failed to retrieve the application's exit code"
echo "***********************************************************************"
exit 1
fi
echo "EXIT_CODE is ${EXIT_CODE}" echo "EXIT_CODE is ${EXIT_CODE}"
if [ $'0\r' != "${EXIT_CODE}" ]; then if [ $'0\r' != "${EXIT_CODE}" ]; then
exit 1 exit 1