mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
common: use mke2fs -F instead of piping in yes
It's possible based on a race conditions (and possibly the version of
coreutils which supplies /usr/bin/yes) that commands of the form:
yes | $MKFS_PROG ...
will end up causing the following failure:
shared/298 16s ... [23:49:03] [23:49:19] - output mismatch (see /results/results-4k/shared/298.out.bad)
--- tests/shared/298.out 2014-10-31 10:13:04.000000000 -0400
+++ /results/results-4k/shared/298.out.bad 2014-11-29 23:49:19.118138099 -0500
@@ -1,4 +1,6 @@
QA output created by 298
+yes: standard output: Broken pipe
+yes: write error
Generating garbage on loop...done.
Running fstrim...done.
Detecting interesting holes in image...done.
...
(Run 'diff -u tests/shared/298.out /results/results-4k/shared/298.out.bad' to see the entire diff)
Using mke2fs's -F option instad of "yes | $MKFS_PROG" fixes this issue.
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
committed by
Dave Chinner
parent
f5b137bd8b
commit
a5a2db3aba
@@ -517,6 +517,9 @@ _test_mkfs()
|
||||
btrfs)
|
||||
$MKFS_BTRFS_PROG $MKFS_OPTIONS $* $TEST_DEV > /dev/null
|
||||
;;
|
||||
ext2|ext3|ext4)
|
||||
$MKFS_PROG -t $FSTYP -- -F $MKFS_OPTIONS $* $TEST_DEV
|
||||
;;
|
||||
*)
|
||||
yes | $MKFS_PROG -t $FSTYP -- $MKFS_OPTIONS $* $TEST_DEV
|
||||
;;
|
||||
@@ -535,6 +538,11 @@ _mkfs_dev()
|
||||
btrfs)
|
||||
$MKFS_BTRFS_PROG $MKFS_OPTIONS $* 2>$tmp_dir.mkfserr 1>$tmp_dir.mkfsstd
|
||||
;;
|
||||
ext2|ext3|ext4)
|
||||
$MKFS_PROG -t $FSTYP -- -F $MKFS_OPTIONS $* \
|
||||
2>$tmp_dir.mkfserr 1>$tmp_dir.mkfsstd
|
||||
;;
|
||||
|
||||
*)
|
||||
yes | $MKFS_PROG -t $FSTYP -- $MKFS_OPTIONS $* \
|
||||
2>$tmp_dir.mkfserr 1>$tmp_dir.mkfsstd
|
||||
@@ -581,6 +589,9 @@ _scratch_mkfs()
|
||||
btrfs)
|
||||
$MKFS_BTRFS_PROG $MKFS_OPTIONS $* $SCRATCH_DEV > /dev/null
|
||||
;;
|
||||
ext2|ext3)
|
||||
$MKFS_PROG -t $FSTYP -- -F $MKFS_OPTIONS $* $SCRATCH_DEV
|
||||
;;
|
||||
ext4)
|
||||
_scratch_mkfs_ext4 $*
|
||||
;;
|
||||
@@ -657,7 +668,7 @@ _scratch_mkfs_sized()
|
||||
fi
|
||||
;;
|
||||
ext2|ext3|ext4|ext4dev)
|
||||
yes | ${MKFS_PROG}.$FSTYP $MKFS_OPTIONS -b $blocksize $SCRATCH_DEV $blocks
|
||||
${MKFS_PROG}.$FSTYP -F $MKFS_OPTIONS -b $blocksize $SCRATCH_DEV $blocks
|
||||
;;
|
||||
udf)
|
||||
$MKFS_UDF_PROG $MKFS_OPTIONS -b $blocksize $SCRATCH_DEV $blocks
|
||||
|
||||
Reference in New Issue
Block a user