From: "Theodore Ts'o" <tytso@mit.edu>
To: fstests@vger.kernel.org
Cc: hughd@google.com, Theodore Ts'o <tytso@mit.edu>
Subject: [PATCH 12/16] xfstests: remove dependency on /proc/partitions for generic/312
Date: Sat, 13 Feb 2016 12:41:05 -0500 [thread overview]
Message-ID: <1455385269-26319-13-git-send-email-tytso@mit.edu> (raw)
In-Reply-To: <1455385269-26319-1-git-send-email-tytso@mit.edu>
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
next prev parent reply other threads:[~2016-02-13 17:41 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-13 17:40 [PATCH-v3 00/16] tmpfs and other misc fixups for xfstests Theodore Ts'o
2016-02-13 17:40 ` [PATCH 01/16] ext4/001: add output variant for nodelalloc mounts Theodore Ts'o
2016-02-17 9:58 ` Christoph Hellwig
2016-02-13 17:40 ` [PATCH 02/16] check: avoid spurious complaints that tests/$FSTYP/group does not exist Theodore Ts'o
2016-02-17 9:59 ` Christoph Hellwig
2016-02-13 17:40 ` [PATCH 03/16] common: _scratch_mkfs_sized() for tmpfs Theodore Ts'o
2016-02-17 9:59 ` Christoph Hellwig
2016-02-13 17:40 ` [PATCH 04/16] generic: use mount point instead of device name Theodore Ts'o
2016-02-17 10:00 ` Christoph Hellwig
2016-02-13 17:40 ` [PATCH 05/16] generic: remove the generic/125 test Theodore Ts'o
2016-02-17 10:03 ` Christoph Hellwig
2016-02-21 21:52 ` Dave Chinner
2016-02-22 7:36 ` Christoph Hellwig
2016-02-13 17:40 ` [PATCH 06/16] generic: add _require_odirect to generic/113 and generic/214 Theodore Ts'o
2016-02-17 10:03 ` Christoph Hellwig
2016-02-13 17:41 ` [PATCH 07/16] Rename _scratch_mount to _scratch_cycle_mount Theodore Ts'o
2016-02-13 17:41 ` [PATCH 08/16] Rename _test_mount to _test_cycle_mount Theodore Ts'o
2016-02-13 17:41 ` [PATCH 09/16] xfstests: do not unmount tmpfs during remount Theodore Ts'o
2016-02-16 6:43 ` [PATCH-v3a " Theodore Ts'o
2016-02-17 3:05 ` [PATCH-v3b " Theodore Ts'o
2016-02-13 17:41 ` [PATCH 10/16] generic: do not unmount before calling _check_scratch_fs() Theodore Ts'o
2016-02-13 17:41 ` [PATCH 11/16] generic: require fiemap for generic/009 Theodore Ts'o
2016-02-17 10:04 ` Christoph Hellwig
2016-02-13 17:41 ` Theodore Ts'o [this message]
2016-02-17 10:06 ` [PATCH 12/16] xfstests: remove dependency on /proc/partitions for generic/312 Christoph Hellwig
2016-02-17 10:36 ` Eryu Guan
2016-02-13 17:41 ` [PATCH 13/16] xfstests: generic/079 and generic/277 requires chattr, not xattrs Theodore Ts'o
2016-02-17 10:06 ` Christoph Hellwig
2016-02-13 17:41 ` [PATCH 14/16] xfstests: add executable permission to tests Theodore Ts'o
2016-02-17 10:07 ` Christoph Hellwig
2016-02-13 17:41 ` [PATCH 15/16] xfstests: increase tmpfs memory size Theodore Ts'o
2016-02-17 10:08 ` Christoph Hellwig
2016-02-13 17:41 ` [PATCH 16/16] xfstests: remove _need_to_be_root Theodore Ts'o
2016-02-17 10:09 ` Christoph Hellwig
2016-02-17 12:22 ` Dave Chinner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1455385269-26319-13-git-send-email-tytso@mit.edu \
--to=tytso@mit.edu \
--cc=fstests@vger.kernel.org \
--cc=hughd@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox