Merge pull request #104 from vchong/kmgk

android optee updates

Author: mwasilew

automated/android/optee/optee-gtest-gatekeeper-keymaster.yaml

@@ -12,6 +12,7 @@ metadata:
         - performance
     devices:
         - hi6220-hikey
+        - hi6220-hikey-bl
 
 params:
     # Specify device serial no. when more than one device connected.

automated/android/optee/optee-gtest-kmgk.sh

@@ -0,0 +1,38 @@
+#!/bin/sh -e
+
+OUTPUT="$(pwd)/output"
+BOOT_TIMEOUT="300"
+LOGFILE="${OUTPUT}/gtest-kmgk-stdout.log"
+RESULT_FILE="${OUTPUT}/result.txt"
+
+usage() {
+    echo "Usage: $0 [-s <android_serial>] [-t <boot_timeout>]" 1>&2
+    exit 1
+}
+
+while getopts ":s:t:" o; do
+  case "$o" in
+    s) ANDROID_SERIAL="${OPTARG}" ;;
+    t) BOOT_TIMEOUT="${OPTARG}" ;;
+    *) usage ;;
+  esac
+done
+
+# shellcheck disable=SC1091
+. ../../lib/sh-test-lib
+# shellcheck disable=SC1091
+. ../../lib/android-test-lib
+
+initialize_adb
+wait_boot_completed "${BOOT_TIMEOUT}"
+create_out_dir "${OUTPUT}"
+
+# Run test.
+info_msg "About to run OP-TEE KMGK gtest on device ${ANDROID_SERIAL}"
+
+adb shell "echo /data/nativetest/KMGK_gtest/KMGK_gtest 2>&1 | su" | tee -a "${LOGFILE}"
+adb shell "echo /data/nativetest64/KMGK_gtest/KMGK_gtest 2>&1 | su" | tee -a "${LOGFILE}"
+
+# Parse test log into RESULT_FILE
+grep "\[ *OK *\] [A-Za-z]" "${LOGFILE}" | awk '{printf("%s pass\n", $4)}' | tee -a "${RESULT_FILE}"
+grep "\[ *FAILED *\] [A-Za-z]" "${LOGFILE}" | awk '{printf("%s fail\n", $4)}' | tee -a "${RESULT_FILE}"

automated/android/optee/optee-gtest-kmgk.yaml

@@ -0,0 +1,26 @@
+metadata:
+    name: optee-gtest-kmgk
+    format: "Lava-Test-Shell Test Definition 1.0"
+    description: "OP-TEE KMGK gtest"
+    maintainer:
+        - victor.chong@linaro.org
+    os:
+        - android
+    scope:
+        - functional
+        - performance
+    devices:
+        - hi6220-hikey
+        - hi6220-hikey-bl
+
+params:
+    # Specify device serial no. when more than one device connected.
+    ANDROID_SERIAL: ""
+    # Specify timeout in seconds for wait_boot_completed
+    BOOT_TIMEOUT: "300"
+
+run:
+    steps:
+        - cd ./automated/android/optee
+        - ./optee-gtest-kmgk.sh -s "${ANDROID_SERIAL}" -t "${BOOT_TIMEOUT}"
+        - ../../utils/send-to-lava.sh ./output/result.txt

automated/android/optee/optee-xtest.yaml

@@ -11,6 +11,7 @@ metadata:
         - performance
     devices:
         - hi6220-hikey
+        - hi6220-hikey-bl
         - juno
 
 params: