diff options
| author | Naresh Kamboju <naresh.kamboju@linaro.org> | 2017-05-26 14:32:33 +0530 |
|---|---|---|
| committer | Naresh Kamboju <naresh.kamboju@linaro.org> | 2017-05-26 14:32:33 +0530 |
| commit | c2cf7fb73c2a1b3e9d2bd36149bc1979aa2e46b4 (patch) | |
| tree | a2d0e71d802501e646a333887fcab49b7e5b87c1 | |
| parent | 748a54de13a6d5cfb3199b3cb0882dcc99bc279f (diff) | |
kselftest: Adding skipfile
Signed-off-by: Naresh Kamboju <naresh.kamboju@linaro.org>
| -rwxr-xr-x | automated/linux/kselftest/kselftest.sh | 28 | ||||
| -rw-r--r-- | automated/linux/kselftest/skipfile-kselftest | 1 |
2 files changed, 27 insertions, 2 deletions
diff --git a/automated/linux/kselftest/kselftest.sh b/automated/linux/kselftest/kselftest.sh index 3369c46..14666d5 100755 --- a/automated/linux/kselftest/kselftest.sh +++ b/automated/linux/kselftest/kselftest.sh @@ -8,20 +8,38 @@ RESULT_FILE="${OUTPUT}/result.txt" LOGFILE="${OUTPUT}/kselftest.txt" TESTPROG="kselftest_armhf.tar.gz" KSELFTEST_PATH="/usr/bin/kselftests" + +SCRIPT="$(readlink -f "${0}")" +SCRIPTPATH="$(dirname "${SCRIPT}")" +# List of test cases to be skipped +SKIPFILE="" + if [ "$(uname -m)" = "aarch64" ] then TESTPROG="kselftest_aarch64.tar.gz" fi usage() { - echo "Usage: $0 [-t kselftest_aarch64.tar.gz | kselftest_armhf.tar.gz] [-s true|false]" 1>&2 + echo "Usage: $0 [-t kselftest_aarch64.tar.gz | kselftest_armhf.tar.gz] [-s true|false] [-S skipfile-kselftest]" 1>&2 exit 1 } -while getopts "t:s:h" opt; do +while getopts "t:s:S:h" opt; do case "${opt}" in t) TESTPROG="${OPTARG}" ;; s) SKIP_INSTALL="${OPTARG}" ;; + S) + OPT=$(echo "${OPTARG}" | grep "http") + if [ -z "${OPT}" ] ; then + # kselftest skipfile + SKIPFILE="${SCRIPTPATH}/${OPTARG}" + else + # Download kselftest skipfile from speficied URL + wget "${OPTARG}" -O "skipfile" + SKIPFILE="skipfile" + SKIPFILE="${SCRIPTPATH}/${SKIPFILE}" + fi + ;; h|*) usage ;; esac done @@ -63,6 +81,12 @@ else cd "kselftest" fi +if [ -n "${SKIPFILE}" ] ; then + for test_name in $( cat ${SKIPFILE} ); do + sed -i '/${test_name}/c\' run_kselftest.sh + done + +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/skipfile-kselftest b/automated/linux/kselftest/skipfile-kselftest new file mode 100644 index 0000000..84a1475 --- /dev/null +++ b/automated/linux/kselftest/skipfile-kselftest @@ -0,0 +1 @@ +test_user_copy.sh |