summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorBen Hutchings <benh@debian.org>2022-01-31 11:49:30 -0500
committerSteve Dickson <steved@redhat.com>2022-01-31 11:49:30 -0500
commitc9c6369451ba032ba7b4044ac0625a77a4e03c17 (patch)
tree07885499b43cdbaf4f336ba340bda5cfb452cee8 /tests
parentf083d3baf27896e895c6936cd0290d363458e501 (diff)
downloadnfs-utils-c9c6369451ba032ba7b4044ac0625a77a4e03c17.tar.gz
nfs-utils: tests: Skip test if /dev/log is missingnfs-utils-2-6-2-rc1
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 <benh@debian.org> Signed-off-by: Salvatore Bonaccorso <carnil@debian.org> Signed-off-by: Steve Dickson <steved@redhat.com>
Diffstat (limited to 'tests')
-rwxr-xr-xtests/t0001-statd-basic-mon-unmon.sh3
-rw-r--r--tests/test-lib.sh9
2 files changed, 11 insertions, 1 deletions
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