[PATCH 12/16] xfstests: remove dependency on /proc/partitions for generic/312

Theodore Ts'o
2016-02-13T17:41:16Z

From: Hugh Dickins <hughd@google.com>

This allows this test to work with tmpfs, if the system has at least
5G of free memory.

Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---
tests/generic/312 | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/tests/generic/312 b/tests/generic/312
index b570814..639eb57 100755
--- a/tests/generic/312
+++ b/tests/generic/312
@@ -51,12 +51,15 @@ _require_scratch

# 5G in byte
fssize=$((2**30 * 5))
-required_blocks=$(($fssize / 1024))
-dev_blocks=$(grep -w $(_short_dev $SCRATCH_DEV) /proc/partitions | $AWK_PROG '{print $3}')
-if [ $required_blocks -gt $dev_blocks ];then
- _notrun "this test requires \$SCRATCH_DEV has ${fssize}B space"
-fi

+# We don't need to do this check for tmpfs because _scratch_mkfs_size
+# will validate the size against the available memory
+if [ "$FSTYP" != "tmpfs" ]; then
+ _scratch_mkfs
+ _scratch_mount
+ _require_fs_space $SCRATCH_MNT $(($fssize / 1024))
+ _scratch_unmount
+fi
rm -f $seqres.full
_scratch_mkfs_sized $fssize >>$seqres.full 2>&1
_scratch_mount >>$seqres.full 2>&1
--
2.5.0