diff options
Diffstat (limited to 'common')
-rwxr-xr-x | common/scripts/kselftest-net.sh | 25 | ||||
-rwxr-xr-x | common/scripts/kselftest-runner.sh | 9 |
2 files changed, 5 insertions, 29 deletions
diff --git a/common/scripts/kselftest-net.sh b/common/scripts/kselftest-net.sh deleted file mode 100755 index a19696a..0000000 --- a/common/scripts/kselftest-net.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -cd $(dirname $0) -BASEDIR=$(pwd) -LAVA_ROOT="${BASEDIR}/../.." -TEST_DIR="${LAVA_ROOT}/kselftest/net" -TESTS="socket psock_fanout psock_tpacket" - -cd ${TEST_DIR} - -if /sbin/modprobe test_bpf; then - /sbin/rmmod test_bpf; - echo "test_bpf: pass"; -else - echo "test_bpf: fail"; -fi - -for t in $TESTS -do - echo - echo "Running $t"; - ./$t; - [ $? -ne 0 ] && echo "$t: fail" || echo "$t: pass"; -done - diff --git a/common/scripts/kselftest-runner.sh b/common/scripts/kselftest-runner.sh index f1526ac..6220051 100755 --- a/common/scripts/kselftest-runner.sh +++ b/common/scripts/kselftest-runner.sh @@ -1,13 +1,14 @@ #!/bin/sh TEST_NAME=$1 -COMMAND=$(basename $2) -DIR=$(dirname $2) +COMMAND=$(basename "$2") +DIR=$(dirname "$2") LOG="result.log"; cd ${DIR} -chmod a+x ${COMMAND} -(./${COMMAND} 2>&1 || echo "${TEST_NAME}: [FAIL]") | tee ${LOG} +ls ${COMMAND} > /dev/null 2>&1 && chmod a+x ${COMMAND} +export PATH=.:${PATH} +(${COMMAND} 2>&1 || echo "${TEST_NAME}: [FAIL]") | tee ${LOG} if [ -n "`grep \"skip\" ${LOG}`" ]; then echo "${TEST_NAME}: [SKIP]"; elif [ -z "`grep \"SKIP\|FAIL\" ${LOG}`" ]; then |