As the script can be configured via environment variables or command line option, it's useful to show the environment variables that we received or set during the test setup. Signed-off-by: Thomas Haller <thaller@xxxxxxxxxx> --- tests/shell/run-tests.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/tests/shell/run-tests.sh b/tests/shell/run-tests.sh index 84975a65243f..82694e9c69d3 100755 --- a/tests/shell/run-tests.sh +++ b/tests/shell/run-tests.sh @@ -139,14 +139,20 @@ if [ "$DO_LIST_TESTS" = y ] ; then exit 0 fi +_TMPDIR="${TMPDIR:-/tmp}" + [ -z "$NFT" ] && NFT="$NFT_TEST_BASEDIR/../../src/nft" ${NFT} > /dev/null 2>&1 ret=$? if [ ${ret} -eq 126 ] || [ ${ret} -eq 127 ]; then - msg_error "cannot execute nft command: ${NFT}" -else - msg_info "using nft command: ${NFT}" + msg_error "cannot execute nft command: $NFT" fi +msg_info "conf: NFT=$(printf '%q' "$NFT")" +msg_info "conf: VERBOSE=$(printf '%q' "$VERBOSE")" +msg_info "conf: DUMPGEN=$(printf '%q' "$DUMPGEN")" +msg_info "conf: VALGRIND=$(printf '%q' "$VALGRIND")" +msg_info "conf: KMEMLEAK=$(printf '%q' "$KMEMLEAK")" +msg_info "conf: TMPDIR=$(printf '%q' "$_TMPDIR")" MODPROBE="$(which modprobe)" if [ ! -x "$MODPROBE" ] ; then @@ -163,8 +169,6 @@ cleanup_on_exit() { } trap cleanup_on_exit EXIT -_TMPDIR="${TMPDIR:-/tmp}" - NFT_TEST_TMPDIR="$(mktemp --tmpdir="$_TMPDIR" -d "nft-test.$(date '+%Y%m%d-%H%M%S.%3N').XXXXXX")" || msg_error "Failure to create temp directory in \"$_TMPDIR\"" chmod 755 "$NFT_TEST_TMPDIR" -- 2.41.0