From 924b1cadff3f2782475516d7eca9aabe856dbf0f Mon Sep 17 00:00:00 2001 From: Pádraig Brady Date: Mon, 12 Jan 2015 01:14:11 +0000 Subject: tests: avoid skipping some df tests with libmount * tests/df/no-mtab-status.sh: Provide libmount placeholders, to avoid skipping the test when libmount is in use. * tests/df/skip-duplicates.sh: Likewise. * tests/df/skip-rootfs.sh: Comment that the test is moot when libmount (/proc/self/mountinfo) is being used. --- tests/df/skip-rootfs.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tests/df/skip-rootfs.sh') diff --git a/tests/df/skip-rootfs.sh b/tests/df/skip-rootfs.sh index 9bb142406..ed5364eb3 100755 --- a/tests/df/skip-rootfs.sh +++ b/tests/df/skip-rootfs.sh @@ -22,8 +22,10 @@ print_ver_ df df || skip_ "df fails" # Verify that rootfs is in mtab (and shown when the -a option is specified). +# Note this is the case when /proc/self/mountinfo is parsed +# rather than /proc/mounts. I.E. when libmount is being used. df -a >out || fail=1 -grep '^rootfs' out || skip_ "no rootfs in mtab" +grep '^rootfs' out || skip_ 'no rootfs in mtab' # Ensure that rootfs is suppressed when no options is specified. df >out || fail=1 -- cgit v1.2.3-54-g00ecf