From: "Theodore Ts'o" <tytso@mit.edu>
To: fstests@vger.kernel.org
Cc: hughd@google.com, Theodore Ts'o <tytso@mit.edu>
Subject: [PATCH 08/12] xfstests: fix generic/312 on tmpfs, ignore /proc/partitions
Date: Tue, 9 Feb 2016 20:49:57 -0500 [thread overview]
Message-ID: <1455069001-17846-9-git-send-email-tytso@mit.edu> (raw)
In-Reply-To: <1455069001-17846-1-git-send-email-tytso@mit.edu>
From: Hugh Dickins <hughd@google.com>
312 avoid reading /proc/partitions for tmpfs, just assume enough space.
Signed-off-by: Hugh Dickins <hughd@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---
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
next prev parent reply other threads:[~2016-02-10 1:50 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-10 1:49 [PATCH 00/12] xfstests: fix up various tmpfs failures Theodore Ts'o
2016-02-10 1:49 ` [PATCH 01/12] check: avoid error messages of tests/$FS does not exist Theodore Ts'o
2016-02-10 5:45 ` Dave Chinner
2016-02-10 15:34 ` Theodore Ts'o
2016-02-10 16:28 ` Christoph Hellwig
2016-02-10 23:17 ` Theodore Ts'o
2016-02-10 22:19 ` Dave Chinner
2016-02-10 23:32 ` Theodore Ts'o
2016-02-10 1:49 ` [PATCH 02/12] common: _scratch_mkfs_sized() for tmpfs Theodore Ts'o
2016-02-10 6:00 ` Dave Chinner
2016-02-10 15:58 ` Theodore Ts'o
2016-02-10 22:37 ` Dave Chinner
2016-02-10 1:49 ` [PATCH 03/12] generic: use mount point instead of device name Theodore Ts'o
2016-02-10 1:49 ` [PATCH 04/12] generic: add _require_odirect to three more tests Theodore Ts'o
2016-02-10 9:15 ` Eryu Guan
2016-02-10 16:11 ` Theodore Ts'o
2016-02-10 22:51 ` Dave Chinner
2016-02-10 23:21 ` Theodore Ts'o
2016-02-10 1:49 ` [PATCH 05/12] xfstests: do not unmount tmpfs during remount Theodore Ts'o
2016-02-10 6:07 ` Dave Chinner
2016-02-10 16:07 ` Theodore Ts'o
2016-02-10 18:04 ` Theodore Ts'o
2016-02-10 23:07 ` Dave Chinner
2016-02-10 23:28 ` Theodore Ts'o
2016-02-11 3:07 ` Dave Chinner
2016-02-11 15:25 ` Theodore Ts'o
2016-02-11 17:36 ` Darrick J. Wong
2016-02-10 1:49 ` [PATCH 06/12] generic: do not unmount before calling _check_scratch_fs() Theodore Ts'o
2016-02-10 1:49 ` [PATCH 07/12] generic: require fiemap for generic/009 Theodore Ts'o
2016-02-10 1:49 ` Theodore Ts'o [this message]
2016-02-10 5:54 ` [PATCH 08/12] xfstests: fix generic/312 on tmpfs, ignore /proc/partitions Dave Chinner
2016-02-10 23:39 ` Theodore Ts'o
2016-02-11 2:53 ` Dave Chinner
2016-02-10 1:49 ` [PATCH 09/12] xfstests: generic/079 requires chattr, not xattrs Theodore Ts'o
2016-02-10 9:09 ` Eryu Guan
2016-02-10 16:09 ` Theodore Ts'o
2016-02-10 1:49 ` [PATCH 10/12] generic: disable generic/027 for tmpfs Theodore Ts'o
2016-02-10 5:58 ` Dave Chinner
2016-02-10 15:48 ` Theodore Ts'o
2016-02-10 23:13 ` Dave Chinner
2016-02-10 1:50 ` [PATCH 11/12] xfstests: add executable permission to tests Theodore Ts'o
2016-02-10 9:07 ` Eryu Guan
2016-02-10 1:50 ` [PATCH 12/12] xfstests: increase tmpfs memory size Theodore Ts'o
2016-02-10 2:10 ` [PATCH 00/12] xfstests: fix up various tmpfs failures Theodore Ts'o
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=1455069001-17846-9-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