summaryrefslogtreecommitdiff
path: root/tests/btrfs/123
diff options
context:
space:
mode:
authorEryu Guan <eguan@redhat.com>2016-12-05 00:15:08 +0800
committerEryu Guan <eguan@redhat.com>2016-12-19 10:34:49 +0800
commit596a068bf130d5430b9078923b28ab5263e98d73 (patch)
tree98e113aa087d525195e4bb5560bf74b5a2fe5747 /tests/btrfs/123
parentc1cd6b1d57e1e47e626dd771d1697937414002ac (diff)
fstests: teach _scratch_mkfs to handle mkfs option conflicts
Currently in _scratch_mkfs only xfs and ext4 could handle the mkfs failure caused by conflicts between $MKFS_OPTIONS and mkfs options specified by tests, because of _scratch_mkfs_xfs and _scratch_mkfs_ext4. This is a very useful functionality that allows tests to specify mkfs options safely and to test specific fs configurations, without worrying about mkfs failures caused by these options. Now teach _scratch_mkfs to handle such mkfs option conflicts for other filesystems too, i.e. mkfs again only with mkfs options specified by tests. Also add the ability to filter unnecessary messages from mkfs stderr. Also update some btrfs tests to throw away _scratch_mkfs stdout, because previously _scratch_mkfs did this for btrfs. Reviewed-by: Brian Foster <bfoster@redhat.com> Signed-off-by: Eryu Guan <eguan@redhat.com>
Diffstat (limited to 'tests/btrfs/123')
-rwxr-xr-xtests/btrfs/1232
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/btrfs/123 b/tests/btrfs/123
index 52d87fbb..4b2e667f 100755
--- a/tests/btrfs/123
+++ b/tests/btrfs/123
@@ -55,7 +55,7 @@ _supported_os Linux
_require_scratch
_require_btrfs_qgroup_report
-_scratch_mkfs
+_scratch_mkfs >/dev/null
# Need to use inline extents to fill metadata rapidly
_scratch_mount "-o max_inline=2048"