monkey.sh: change the default value for blacklist and throttle

so that we don't need to pass the empty blacklist and throttle
to monkey.sh when we use the default monkey parameters value.

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

2 files changed, 28 insertions, 17 deletions

diff --git a/automated/android/monkey/monkey.sh b/automated/android/monkey/monkey.sh
index 80130cd..b865f8f 100755
--- a/automated/android/monkey/monkey.sh
+++ b/automated/android/monkey/monkey.sh
@@ -21,15 +21,16 @@ usage() {
 # Some default parameters
 ANDROID_SERIAL=""
 BOOT_TIMEOUT="300"
-BLACKLIST="com.android.development_settings com.android.music com.android.deskclock"
+BLACKLIST=""
 MONKEY_PARAMS="-s 1 --pct-touch 10 --pct-motion 20 --pct-nav 20 --pct-majornav 30 --pct-appswitch 20"
 EVENT_COUNT="1000"
-THROTTLE="200"
+# default as it is in monkey command
+THROTTLE="0"
 
 while getopts ":s:t:b:p:e:T:h" opt; do
     case "$opt" in
-    	s) ANDROID_SERIAL="${OPTARG}" ;;
-    	t) BOOT_TIMEOUT="${OPTARG}" ;;
+        s) ANDROID_SERIAL="${OPTARG}" ;;
+        t) BOOT_TIMEOUT="${OPTARG}" ;;
         b) BLACKLIST="${OPTARG}" ;;
         p) MONKEY_PARAMS="${OPTARG}" ;;
         e) EVENT_COUNT="${OPTARG}" ;;
@@ -45,20 +46,30 @@ initialize_adb
 wait_boot_completed "${BOOT_TIMEOUT}"
 create_out_dir "${HOST_OUTPUT}"
 
-# Read blacklist and write to blacklist.txt
-arr=$(echo "$BLACKLIST" | tr "," " ")
-info_msg "--- blacklist ---"
-for s in $arr
-do
-    echo "$s"
-    echo "$s" >> "$BLACKLIST_FILE"
-done
+if [ -n "$BLACKLIST" ]; then
+    # Read blacklist and write to blacklist.txt
+    arr=$(echo "$BLACKLIST" | tr "," " ")
+    info_msg "--- blacklist ---"
+    for s in $arr
+    do
+        echo "$s"
+        echo "$s" >> "$BLACKLIST_FILE"
+    done
+
+    adb_push "$BLACKLIST_FILE" "/data/local/tmp/"
+    BLACKLIST_OPT="--pkg-blacklist-file /data/local/tmp/blacklist.txt"
+else
+    BLACKLIST_OPT=""
+fi
 
-adb_push "$BLACKLIST_FILE" "/data/local/tmp/"
-BLACKLIST="/data/local/tmp/blacklist.txt"
+if [ -n "$THROTTLE" ]; then
+    THROTTLE_OPT="--throttle ${THROTTLE}"
+else
+    THROTTLE_OPT=""
+fi
 
 info_msg "device-${ANDROID_SERIAL}: About to run monkey..."
-adb shell monkey "${MONKEY_PARAMS}" --pkg-blacklist-file "${BLACKLIST}" --throttle "${THROTTLE}" "${EVENT_COUNT}" 2>&1 \
+adb shell monkey "${MONKEY_PARAMS}" ${BLACKLIST_OPT} ${THROTTLE_OPT} "${EVENT_COUNT}" 2>&1 \
     | tee "${LOGFILE}"
 
 # Parse test log.
diff --git a/automated/android/monkey/monkey.yaml b/automated/android/monkey/monkey.yaml
index d5aab2c..42bd0c1 100755
--- a/automated/android/monkey/monkey.yaml
+++ b/automated/android/monkey/monkey.yaml
@@ -27,13 +27,13 @@ params:
     # Specify timeout in seconds for wait_boot_completed.
     BOOT_TIMEOUT: "300"
     # Blacklist packages known to crash.
-    BLACKLIST: "com.android.development_settings com.android.music com.android.deskclock"
+    BLACKLIST: ""
     # Basic monkey comand parameters.
     MONKEY_PARAMS: "-s 1 --pct-touch 10 --pct-motion 20 --pct-nav 20 --pct-majornav 30 --pct-appswitch 20"
     # The number of monkey event.
     EVENT_COUNT: "1000"
     # The interval of monkey event.
-    THROTTLE: "200"
+    THROTTLE: "0"
 
 run:
     steps: