From: Hugh Dickins <hughd@xxxxxxxxxx>
312 avoid reading /proc/partitions for tmpfs, just assume enough space.
Signed-off-by: Hugh Dickins <hughd@xxxxxxxxxx>
Signed-off-by: Theodore Ts'o <tytso@xxxxxxx>
---
tests/generic/312 | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/tests/generic/312 b/tests/generic/312
index b570814..a826071 100755
--- a/tests/generic/312
+++ b/tests/generic/312
@@ -51,12 +51,13 @@ _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"
+if [ "$FSTYP" != "tmpfs" ]; then
+ 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
fi
-
rm -f $seqres.full
_scratch_mkfs_sized $fssize >>$seqres.full 2>&1
_scratch_mount >>$seqres.full 2>&1
--
2.5.0
--
To unsubscribe from this list: send the line "unsubscribe fstests" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
