platform_tools/android/bin/android_run_skia - Issue 204713003: android_run_skia: fix error check

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: platform_tools/android/bin/android_run_skia

Issue 204713003: android_run_skia: fix error check (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 6 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

OLD	NEW
1 #!/bin/bash	1 #!/bin/bash

2 #	2 #

3 # android_run_skia: starts the correct skia program on the device, prints the	3 # android_run_skia: starts the correct skia program on the device, prints the

4 # output, and kills the app if interrupted.	4 # output, and kills the app if interrupted.

5	5

6 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"	6 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"

7 source $SCRIPT_DIR/android_setup.sh	7 source $SCRIPT_DIR/android_setup.sh

8 source $SCRIPT_DIR/utils/setup_adb.sh	8 source $SCRIPT_DIR/utils/setup_adb.sh

9	9

10 configuration="Debug"	10 configuration="Debug"

(...skipping 24 matching lines...) Expand all Loading...
35 adb_push_if_needed "${SKIA_OUT}/${configuration}/lib.target/lib${runVars[0]}.so" /data/local/tmp	35 adb_push_if_needed "${SKIA_OUT}/${configuration}/lib.target/lib${runVars[0]}.so" /data/local/tmp

36	36

37 STATUS_FILENAME="/data/local/tmp/.skia_tmp_$(date +%s%N)"	37 STATUS_FILENAME="/data/local/tmp/.skia_tmp_$(date +%s%N)"

38 $ADB ${DEVICE_SERIAL} shell "/data/local/tmp/skia_launcher ${runVars[@]}; echo \ $? > ${STATUS_FILENAME}"	38 $ADB ${DEVICE_SERIAL} shell "/data/local/tmp/skia_launcher ${runVars[@]}; echo \ $? > ${STATUS_FILENAME}"

39 if [ -z "$($ADB $DEVICE_SERIAL shell 'if [ -f $STATUS_FILENAME ]; then echo exis ts; fi')" ]; then	39 if [ -z "$($ADB $DEVICE_SERIAL shell 'if [ -f $STATUS_FILENAME ]; then echo exis ts; fi')" ]; then

40 exit 1	40 exit 1

41 fi	41 fi

42 EXIT_CODE=`$ADB ${DEVICE_SERIAL} shell cat ${STATUS_FILENAME}`	42 EXIT_CODE=`$ADB ${DEVICE_SERIAL} shell cat ${STATUS_FILENAME}`

43 $ADB ${DEVICE_SERIAL} shell rm ${STATUS_FILENAME}	43 $ADB ${DEVICE_SERIAL} shell rm ${STATUS_FILENAME}

44 echo "EXIT_CODE is [${EXIT_CODE}]"	44 echo "EXIT_CODE is [${EXIT_CODE}]"

45 if [ $'0\r' != ${EXIT_CODE} ]; then	45 if [ $'0\r' != "${EXIT_CODE}" ]; then
	epoger 2014/03/20 19:44:40 Now that I added the debugging, I can see the prob Now that I added the debugging, I can see the problem. From http://108.170.219.162:10117/builders/Test-Android-Nexus10-MaliT604-Arm7-Debu... : [12:18:28.814235] rm failed for /data/local/tmp/.skia_tmp_1395342620264923573, No such file or directory [12:18:28.814342] EXIT_CODE is [/system/bin/sh: cat: /data/local/tmp/.skia_tmp_1395342620264923573: No such file or directory [12:18:28.814342] ] [12:18:28.814395] platform_tools/android/bin/android_run_skia: line 45: [: too many arguments
46 exit 1	46 exit 1

47 fi	47 fi

48 exit 0	48 exit 0

OLD	NEW

« no previous file with comments | « no previous file | no next file » | no next file with comments »