From c9c6369451ba032ba7b4044ac0625a77a4e03c17 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 31 Jan 2022 11:49:30 -0500 Subject: nfs-utils: tests: Skip test if /dev/log is missing Some build environments don't have a /dev/log, without which the daemons will fail to run. * Add a check_dev_log function to skip a test if it's missing * Call it in t0001-statd-basic-mon-unmon.sh Signed-off-by: Ben Hutchings Signed-off-by: Salvatore Bonaccorso Signed-off-by: Steve Dickson --- tests/t0001-statd-basic-mon-unmon.sh | 3 ++- tests/test-lib.sh | 9 +++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/tests/t0001-statd-basic-mon-unmon.sh b/tests/t0001-statd-basic-mon-unmon.sh index 92517a1..e1065e7 100755 --- a/tests/t0001-statd-basic-mon-unmon.sh +++ b/tests/t0001-statd-basic-mon-unmon.sh @@ -21,8 +21,9 @@ . ./test-lib.sh -# This test needs root privileges +# This test needs root privileges and /dev/log check_root +check_dev_log start_statd if [ $? -ne 0 ]; then diff --git a/tests/test-lib.sh b/tests/test-lib.sh index e47ad13..b62ac2a 100644 --- a/tests/test-lib.sh +++ b/tests/test-lib.sh @@ -37,6 +37,15 @@ check_root() { fi } +# Most tests require /dev/log. Skip the test if it doesn't exist in this +# environment. +check_dev_log() { + if ! [ -e /dev/log ]; then + echo "*** Skipping this tests as it requires /dev/log ***" + exit 77 + fi +} + # is lockd registered as a service? lockd_registered() { rpcinfo -p | grep -q nlockmgr -- cgit v1.2.1