diff options
Diffstat (limited to 'automated/android/boottime')
-rwxr-xr-x | automated/android/boottime/boottime.sh | 3 | ||||
-rw-r--r-- | automated/android/boottime/boottime.yaml | 4 | ||||
-rwxr-xr-x | automated/android/boottime/device-script.sh | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/automated/android/boottime/boottime.sh b/automated/android/boottime/boottime.sh index 18b8d68..93b6f4d 100755 --- a/automated/android/boottime/boottime.sh +++ b/automated/android/boottime/boottime.sh @@ -6,12 +6,13 @@ BOOT_TIMEOUT="300" OPERATION="COLLECT" COLLECT_NO="1" OUTPUT="$(pwd)/output" +SKIP_INSTALL='true' . ../../lib/sh-test-lib . ../../lib/android-test-lib usage() { - echo "Usage: $0 [-S <skip_install>] [-s <android_serial>] [-t <boot_timeout>] [-o <COLLECT|ANALYZE>] [-n <collect_no>]" 1>&2 + echo "Usage: $0 [-S skip_install <true|false>] [-s <android_serial>] [-t <boot_timeout>] [-o <COLLECT|ANALYZE>] [-n <collect_no>]" 1>&2 exit 1 } diff --git a/automated/android/boottime/boottime.yaml b/automated/android/boottime/boottime.yaml index 14f7154..58f4a3d 100644 --- a/automated/android/boottime/boottime.yaml +++ b/automated/android/boottime/boottime.yaml @@ -18,6 +18,8 @@ metadata: - hi6220-hikey params: + # specify true or false to skip or not the installation of lxc packages + SKIP_INSTALL: "false" # Specify device serial no. when more than one device connected. ANDROID_SERIAL: "" # Specify timeout in seconds for wait_boot_completed. @@ -32,6 +34,6 @@ params: run: steps: - cd ./automated/android/boottime - - ./boottime.sh -s "${ANDROID_SERIAL}" -t "${BOOT_TIMEOUT}" -o "${OPERATION}" -n "${COLLECT_NO}" + - ./boottime.sh -S "${SKIP_INSTALL}" -s "${ANDROID_SERIAL}" -t "${BOOT_TIMEOUT}" -o "${OPERATION}" -n "${COLLECT_NO}" - if [ "${OPERATION}" = "ANALYZE" ]; then ../../utils/upload-to-artifactorial.sh -a "output/boottime.tgz" -u "${URL}" -t "${TOKEN}"; fi - ../../utils/send-to-lava.sh ./output/result.txt diff --git a/automated/android/boottime/device-script.sh b/automated/android/boottime/device-script.sh index ce78a35..d2d74d7 100755 --- a/automated/android/boottime/device-script.sh +++ b/automated/android/boottime/device-script.sh @@ -418,7 +418,7 @@ elif [ "X${OPERATION}" = "XANALYZE" ]; then ## Check if there is any case that the surfaceflinger service ## was started several times - if [ ${count} -eq 0 ]; then + if [ "${count}" -eq 0 ]; then i=0 else i=1 @@ -477,7 +477,7 @@ elif [ "X${OPERATION}" = "XANALYZE" ]; then fi if ${no_checking_problem}; then - if [ ${count} -eq 0 ]; then + if [ "${count}" -eq 0 ]; then i=0 else i=1 |