sync tradefed with upstream

Change-Id: I3235541be788e8230cd245057f5b090bf1bfb897
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>

1 files changed, 16 insertions, 12 deletions

diff --git a/automated/android/tradefed/tradefed.sh b/automated/android/tradefed/tradefed.sh
index f020542..a03fd5a 100755
--- a/automated/android/tradefed/tradefed.sh
+++ b/automated/android/tradefed/tradefed.sh
@@ -13,13 +13,19 @@ TEST_PATH="android-cts"
 RESULT_FORMAT="aggregated"
 RESULT_FILE="$(pwd)/output/result.txt"
 export RESULT_FILE
+# the default number of failed test cases to be printed
+FAILURES_PRINTED="0"
+# WIFI AP SSID
+AP_SSID=""
+# WIFI AP KEY
+AP_KEY=""
 
 usage() {
-    echo "Usage: $0 [-o timeout] [-n serialno] [-c cts_url] [-t test_params] [-p test_path] [-r <aggregated|atomic>]" 1>&2
+    echo "Usage: $0 [-o timeout] [-n serialno] [-c cts_url] [-t test_params] [-p test_path] [-r <aggregated|atomic>] [-f failures_printed] [-a <ap_ssid>] [-k <ap_key>]" 1>&2
     exit 1
 }
 
-while getopts ':o:n:c:t:p:r:' opt; do
+while getopts ':o:n:c:t:p:r:f:a:k:' opt; do
     case "${opt}" in
         o) TIMEOUT="${OPTARG}" ;;
         n) export ANDROID_SERIAL="${OPTARG}" ;;
@@ -27,6 +33,9 @@ while getopts ':o:n:c:t:p:r:' opt; do
         t) TEST_PARAMS="${OPTARG}" ;;
         p) TEST_PATH="${OPTARG}" ;;
         r) RESULT_FORMAT="${OPTARG}" ;;
+        f) FAILURES_PRINTED="${OPTARG}" ;;
+        a) AP_SSID="${OPTARG}" ;;
+        k) AP_KEY="${OPTARG}" ;;
         *) usage ;;
     esac
 done
@@ -37,6 +46,7 @@ fi
 
 disable_suspend
 wait_boot_completed "${TIMEOUT}"
+disable_suspend
 # wait_homescreen() searches logcat output for
 # 'Displayed com.android.launcher', but the log might be washed away when
 # a lot of logs generated after it. When the function not executed in
@@ -54,23 +64,14 @@ java -version
 
 # Download CTS/VTS test package or copy it from local disk.
 if echo "${TEST_URL}" | grep "^http" ; then
-    df -h
-    ls -l ./
-    ls -l ../
     wget -S --progress=dot:giga "${TEST_URL}"
 else
     cp "${TEST_URL}" ./
 fi
-echo "before run basename"
 file_name=$(basename "${TEST_URL}")
-
-echo "before run unzip"
-pwd
-ls -l ./*
 unzip -q "${file_name}"
 rm -f "${file_name}"
 
-echo "after run unzip"
 if [ -d "${TEST_PATH}/results" ]; then
     mv "${TEST_PATH}/results" "${TEST_PATH}/results_$(date +%Y%m%d%H%M%S)"
 fi
@@ -80,6 +81,9 @@ if [ -e "${TEST_PATH}/testcases/vts/testcases/kernel/linux_kselftest/kselftest_c
     sed -i "/suspend/d" "${TEST_PATH}"/testcases/vts/testcases/kernel/linux_kselftest/kselftest_config.py
 fi
 
+# try to connect wifi if AP information specified
+adb_join_wifi "${AP_SSID}" "${AP_KEY}"
+
 # Run tradefed test.
 info_msg "About to run tradefed shell on device ${ANDROID_SERIAL}"
-./tradefed-runner.py -t "${TEST_PARAMS}" -p "${TEST_PATH}" -r "${RESULT_FORMAT}"
+./tradefed-runner.py -t "${TEST_PARAMS}" -p "${TEST_PATH}" -r "${RESULT_FORMAT}" -f "${FAILURES_PRINTED}"