kselftest: Added SKIPLIST and SKIPFILE to skip known unsupported tests

Signed-off-by: Naresh Kamboju <naresh.kamboju@linaro.org>

2 files changed, 28 insertions, 7 deletions

diff --git a/automated/linux/kselftest/kselftest.sh b/automated/linux/kselftest/kselftest.sh
index 14666d5..e60c783 100755
--- a/automated/linux/kselftest/kselftest.sh
+++ b/automated/linux/kselftest/kselftest.sh
@@ -13,6 +13,7 @@ SCRIPT="$(readlink -f "${0}")"
 SCRIPTPATH="$(dirname "${SCRIPT}")"
 # List of test cases to be skipped
 SKIPFILE=""
+SKIPLIST=""
 
 if [ "$(uname -m)" = "aarch64" ]
 then
@@ -20,15 +21,23 @@ then
 fi
 
 usage() {
-    echo "Usage: $0 [-t kselftest_aarch64.tar.gz | kselftest_armhf.tar.gz] [-s true|false] [-S skipfile-kselftest]" 1>&2
+    echo "Usage: $0 [-t kselftest_aarch64.tar.gz | kselftest_armhf.tar.gz]
+                    [-s True|False]
+                    [-L List of skip test cases]
+                    [-S Skipfile-kselftest]" 1>&2
     exit 1
 }
 
-while getopts "t:s:S:h" opt; do
+while getopts "t:s:L:S:h" opt; do
     case "${opt}" in
         t) TESTPROG="${OPTARG}" ;;
         s) SKIP_INSTALL="${OPTARG}" ;;
-        S) 
+        # List of skip test cases
+        L)
+           SKIPLIST="${OPTARG}"
+           # Ignore SKIPFILE when SKIPLIST provided
+           SKIPFILE="" ;;
+        S)
            OPT=$(echo "${OPTARG}" | grep "http")
            if [ -z "${OPT}" ] ; then
            # kselftest skipfile
@@ -81,12 +90,21 @@ else
     cd "kselftest"
 fi
 
-if [ -n "${SKIPFILE}" ] ; then
-    for test_name in $( cat ${SKIPFILE} ); do
-        sed -i '/${test_name}/c\' run_kselftest.sh
+if [ -n "${SKIPLIST}" ]; then
+    # shellcheck disable=SC2086
+    for test_name in ${SKIPLIST}; do
+        # shellcheck disable=SC2086
+        sed -i "/${test_name}/c\echo \"selftests: ${test_name} [SKIP]\"" run_kselftest.sh
     done
+fi
 
+if [ -f "${SKIPFILE}" ]; then
+    while read -r test_name; do
+        # shellcheck disable=SC2086
+        sed -i "/${test_name}/c\echo \"selftests: ${test_name} [SKIP]\"" run_kselftest.sh
+    done < "${SKIPFILE}"
 fi
+
 # run_kselftest.sh file generated by kselftest Makefile and included in tarball
 ./run_kselftest.sh 2>&1 | tee "${LOGFILE}"
 parse_output
diff --git a/automated/linux/kselftest/kselftest.yaml b/automated/linux/kselftest/kselftest.yaml
index c5465c8..994e63d 100644
--- a/automated/linux/kselftest/kselftest.yaml
+++ b/automated/linux/kselftest/kselftest.yaml
@@ -20,11 +20,14 @@ params:
     # TESTPROG: kselftest_aarch64.tar.gz
     TESTPROG: kselftest_armhf.tar.gz
     SKIP_INSTALL: "false"
+    SKIPLIST: ""
+    SKIPFILE: ""
+
 
 run:
     steps:
         - cd ./automated/linux/kselftest/
-        - ./kselftest.sh -t "${TESTPROG}" -s "${SKIP_INSTALL}"
+        - ./kselftest.sh -t "${TESTPROG}" -s "${SKIP_INSTALL}" -L "${SKIPLIST}" -S "${SKIPFILE}"
 
 parse:
     pattern: "^selftests:\\s(?P<test_case_id>\\S+)\\s[[](?P<result>(FAIL|PASS|SKIP))[]]"