From 77a24724f6172af157b09fdfb870a8f526f39424 Mon Sep 17 00:00:00 2001 From: Pádraig Brady Date: Tue, 10 Dec 2013 16:29:11 +0000 Subject: tests: df/total-unprocessed: fix false failure with lofs * tests/df/total-unprocessed.sh: Skip the test when we can't determine the file system type as the exclusion filter is not applied in that case. "lofs" being ignored is effectively an unknown file system type. --- tests/df/total-unprocessed.sh | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'tests') diff --git a/tests/df/total-unprocessed.sh b/tests/df/total-unprocessed.sh index 24b83a935..3bbfc6bfb 100755 --- a/tests/df/total-unprocessed.sh +++ b/tests/df/total-unprocessed.sh @@ -25,11 +25,13 @@ cat <<\EOF > exp || framework_failure_ df: no file systems processed 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 -t _non_existent_fstype_ --total '.' 2>out && fail=1 -compare exp out || fail=1 +# Check we exit with non-Zero. +# Note we don't check when the file system can't be determined +# as -t filtering is not applied in that case. +if test "$(df --output=fstype . | tail -n1)" != '-'; then + df -t _non_existent_fstype_ --total . 2>out && fail=1 + compare exp out || fail=1 +fi cat <<\EOF > exp || framework_failure_ df: '_does_not_exist_': No such file or directory -- cgit v1.2.3-70-g09d2