Cleanup finding the test files. Also add a "--list-tests" option to see
which tests are found and would run.
Also get rid of the FIND="$(which find)" detection. It's not that the
user could set the used find program via an environment variable. Also,
which system doesn't have "find"? Just fail when our call to "find"
fails.
This is still after "unshare", which makes no sense and will be
addressed next.
Signed-off-by: Thomas Haller <thaller@xxxxxxxxxx>
---
tests/shell/run-tests.sh | 52 ++++++++++++++++++++--------------------
1 file changed, 26 insertions(+), 26 deletions(-)
diff --git a/tests/shell/run-tests.sh b/tests/shell/run-tests.sh
index 2ece280a2408..147185cb548a 100755
--- a/tests/shell/run-tests.sh
+++ b/tests/shell/run-tests.sh
@@ -17,10 +17,11 @@ usage() {
echo " $0 [OPTIONS]"
echo
echo "OPTIONS:"
- echo " \"-v\" : also VERBOSE=y"
- echo " \"-g\" : also DUMPGEN=y"
- echo " \"-V\" : also VALGRIND=y"
- echo " \"-K\" : also KMEMLEAK=y"
+ echo " \"-v\" : also VERBOSE=y"
+ echo " \"-g\" : also DUMPGEN=y"
+ echo " \"-V\" : also VALGRIND=y"
+ echo " \"-K\" : also KMEMLEAK=y"
+ echo " \"-L\"|\"-list-tests\" : list the test name and quit"
echo
echo "VARIABLES:"
echo " NFT=<PATH> : Path to nft executable"
@@ -31,8 +32,9 @@ usage() {
}
# Configuration
-TESTDIR="./$(dirname $0)/testcases"
-SRC_NFT="$(dirname $0)/../../src/nft"
+BASEDIR="$(dirname "$0")"
+TESTDIR="$BASEDIR/testcases"
+SRC_NFT="$BASEDIR/../../src/nft"
DIFF=$(which diff)
if [ "$(id -u)" != "0" ] ; then
@@ -52,6 +54,7 @@ VERBOSE="$VERBOSE"
DUMPGEN="$DUMPGEN"
VALGRIND="$VALGRIND"
KMEMLEAK="$KMEMLEAK"
+DO_LIST_TESTS=
TESTS=()
@@ -75,6 +78,9 @@ while [ $# -gt 0 ] ; do
usage
exit 0
;;
+ -L|--list-tests)
+ DO_LIST_TESTS=y
+ ;;
--)
TESTS=("$@")
VERBOSE=y
@@ -88,7 +94,19 @@ while [ $# -gt 0 ] ; do
esac
done
-SINGLE="${TESTS[*]}"
+if [ ! -d "$TESTDIR" ] ; then
+ msg_error "missing testdir $TESTDIR"
+fi
+
+if [ "${#TESTS[@]}" -eq 0 ]; then
+ TESTS=( $(find "$TESTDIR" -type f -executable | sort) ) || \
+ msg_error "Could not find tests"
+fi
+
+if [ "$DO_LIST_TESTS" = y ] ; then
+ printf '%s\n' "${TESTS[@]}"
+ exit 0
+fi
[ -z "$NFT" ] && NFT=$SRC_NFT
${NFT} > /dev/null 2>&1
@@ -99,15 +117,6 @@ else
msg_info "using nft command: ${NFT}"
fi
-if [ ! -d "$TESTDIR" ] ; then
- msg_error "missing testdir $TESTDIR"
-fi
-
-FIND="$(which find)"
-if [ ! -x "$FIND" ] ; then
- msg_error "no find binary found"
-fi
-
MODPROBE="$(which modprobe)"
if [ ! -x "$MODPROBE" ] ; then
msg_error "no modprobe binary found"
@@ -142,14 +151,6 @@ kernel_cleanup() {
nft_xfrm
}
-find_tests() {
- if [ ! -z "$SINGLE" ] ; then
- echo $SINGLE
- return
- fi
- ${FIND} ${TESTDIR} -type f -executable | sort
-}
-
printscript() { # (cmd, tmpd)
cat <<EOF
#!/bin/bash
@@ -247,8 +248,7 @@ check_kmemleak()
check_taint
-for testfile in $(find_tests)
-do
+for testfile in "${TESTS[@]}" ; do
read taint < /proc/sys/kernel/tainted
kernel_cleanup
--
2.41.0
