diff options
| -rwxr-xr-x | tests/df/total-unprocessed | 3 | ||||
| -rw-r--r-- | tests/init.cfg | 8 |
2 files changed, 10 insertions, 1 deletions
diff --git a/tests/df/total-unprocessed b/tests/df/total-unprocessed index 9742591f7..aa4983683 100755 --- a/tests/df/total-unprocessed +++ b/tests/df/total-unprocessed @@ -19,6 +19,7 @@ . "${srcdir=.}/init.sh"; path_prepend_ ../src print_ver_ df +require_mount_list_ cat <<\EOF > exp || framework_failure_ df: no file systems processed @@ -27,7 +28,7 @@ EOF # The following simply finds no match for the combination # of the options --local and FS-type nfs together with the # argument ".". It must exit non-Zero nonetheless. -df --local -t nfs --total "." 2>out && fail=1 +df --local -t nfs --total '.' 2>out && fail=1 compare exp out || fail=1 cat <<\EOF > exp || framework_failure_ diff --git a/tests/init.cfg b/tests/init.cfg index 506c9b329..4ff5ad4d5 100644 --- a/tests/init.cfg +++ b/tests/init.cfg @@ -77,8 +77,16 @@ is_local_dir_() df --local "$1" >/dev/null 2>&1 } +require_mount_list_() +{ + local mount_list_fail='cannot read table of mounted file systems' + df 2>&1 | grep -F "$mount_list_fail" >/dev/null && + skip_ "$mount_list_fail" +} + require_local_dir_() { + require_mount_list_ is_local_dir_ . || skip_ "This test must be run on a local file system." } |