diff options
author | Naresh Kamboju <naresh.kamboju@linaro.org> | 2015-03-04 17:36:19 +0530 |
---|---|---|
committer | Milosz Wasilewski <milosz.wasilewski@linaro.org> | 2015-03-09 18:04:52 +0000 |
commit | 68732109acede81d6e70fa915cb1b8a933951506 (patch) | |
tree | 003971cac56bc4895410cd8e5a1e5a045e3aeaa5 | |
parent | 1e716d49c7c898f46273bfa83f0ae0281a568fe0 (diff) |
LTP : ltpfixup: skipfile can be an URL from json
ltp test definitions have been updated to accept skipfile from an
open accessible location via URL as a parameter from LAVA json job file
and still supports old implementation as a file from test-definitions
NOTE: busybox wget may not work with https link so pefer to use http
Change-Id: Idf9b93799326e4fc6650bded8396b15a48c63f3b
Signed-off-by: Naresh Kamboju <naresh.kamboju@linaro.org>
-rwxr-xr-x | common/scripts/ltpfixup.sh | 11 | ||||
-rw-r--r-- | openembedded/ltp.yaml | 6 | ||||
-rw-r--r-- | ubuntu/ltp.yaml | 7 |
3 files changed, 23 insertions, 1 deletions
diff --git a/common/scripts/ltpfixup.sh b/common/scripts/ltpfixup.sh index 2d45877..b72ddc3 100755 --- a/common/scripts/ltpfixup.sh +++ b/common/scripts/ltpfixup.sh @@ -15,7 +15,16 @@ LTP_PATH=/opt/ltp while getopts T:S:P: arg do case $arg in T) TST_CMDFILES="$OPTARG";; - S) SKIPFILE="-S $SCRIPTPATH/ltp/$OPTARG";; + S) OPT=`echo $OPTARG | grep "http"` + if [ -z $OPT ] ; then + SKIPFILE="-S $SCRIPTPATH/ltp/$OPTARG" + else + #wget http://people.linaro.org/~naresh.kamboju/skipfile + wget $OPTARG + SKIPFILE=`echo "${OPTARG##*/}"` + SKIPFILE="-S `pwd`/$SKIPFILE" + fi + ;; P) LTP_PATH=$OPTARG;; esac done diff --git a/openembedded/ltp.yaml b/openembedded/ltp.yaml index 51dee9d..69c7de3 100644 --- a/openembedded/ltp.yaml +++ b/openembedded/ltp.yaml @@ -18,6 +18,12 @@ metadata: params: TST_CMDFILES: syscalls,mm,math,timers,fcntl-locktests,ipc,fsx,fs,hugetlb,io,nptl,pty,containers,fs_bind,filecaps,admin_tools,connectors + # SKIPFILE can be a filename from dir ../common/scripts/ltp/ or an open URL + # SKIPFILE: "skipfile-lsk-juno" + # "skipfile-lsk-juno" is a known file present in dir ../common/scripts/ltp/ + # or + # SKIPFILE: "http://people.linaro.org/~naresh.kamboju/skipfile" + # NOTE: busybox wget may not work with https link so pefer to use http SKIPFILE: "" run: diff --git a/ubuntu/ltp.yaml b/ubuntu/ltp.yaml index 4d8fc3c..3a0aa20 100644 --- a/ubuntu/ltp.yaml +++ b/ubuntu/ltp.yaml @@ -32,9 +32,16 @@ install: - bison - build-essential - wget + - curl params: TST_CMDFILES: syscalls,mm,math,timers,fcntl-locktests,ipc,fsx,fs,hugetlb,io,nptl,pty,containers,fs_bind,filecaps,admin_tools,connectors + # SKIPFILE can be a filename from dir ../common/scripts/ltp/ or an open URL + # SKIPFILE: "skipfile-lsk-juno" + # "skipfile-lsk-juno" is a known file present in dir ../common/scripts/ltp/ + # or + # SKIPFILE: "http://people.linaro.org/~naresh.kamboju/skipfile" + # NOTE: busybox wget may not work with https link so pefer to use http SKIPFILE: "" run: |