mirror of
https://git.savannah.gnu.org/git/coreutils.git
synced 2026-11-17 18:02:09 +03:00
tests: fix validation of local file systems
* tests/init.cfg (require_mount_list_): A new function to ensure we can read the list of file systems. (require_local_dir_): Call the above function, as otherwise the check is invalid. * tests/df/total-unprocessed: Ensure df can read the list of mounted file systems so that --local can be honored.
This commit is contained in:
1 parent
1bacb4bca6
commit
433de5ebbd
2 files changed
+10
-1
No files matched your search
@@ -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_
|
||||
|
||||
@@ -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."
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user