diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2009-10-20 02:06:03 +0400 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2009-10-20 02:06:03 +0400 |
commit | 05647b55512d0fec74fe6d69553a773e852674df (patch) | |
tree | e12249ce2de19cfc4280f2850574958202eb8d9c /util-linux/mkfs_ext2_test.sh | |
parent | 3ef4f77620a9f5f9a7c1247e29ea9c14e07b8a30 (diff) |
mkfs_ext2: compat fixes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'util-linux/mkfs_ext2_test.sh')
-rwxr-xr-x | util-linux/mkfs_ext2_test.sh | 79 |
1 files changed, 48 insertions, 31 deletions
diff --git a/util-linux/mkfs_ext2_test.sh b/util-linux/mkfs_ext2_test.sh index fe6291fc5..9c20b3b89 100755 --- a/util-linux/mkfs_ext2_test.sh +++ b/util-linux/mkfs_ext2_test.sh @@ -1,54 +1,71 @@ #!/bin/sh -test_mke2fs() { - echo Testing $kilobytes - - >image_std - dd seek=$((kilobytes-1)) bs=1K count=1 </dev/zero of=image_std >/dev/null 2>&1 || exit 1 - /usr/bin/mke2fs -F image_std $kilobytes >image_std.raw_out 2>&1 || return 1 - cat image_std.raw_out \ - | grep -v '^mke2fs ' \ +run_test() { # params: mke2fs_invocation image_name + >$2 + dd seek=$((kilobytes-1)) bs=1K count=1 </dev/zero of=$2 >/dev/null 2>&1 || exit 1 + $1 -F $2 $kilobytes >$2.raw_out 2>&1 || return 1 + cat $2.raw_out \ + | grep -v '^mke2fs [0-9]*\.[0-9]*\.[0-9]* ' \ | grep -v '^Maximum filesystem' \ - | grep -v '^warning: .* blocks unused' \ | grep -v '^Writing inode tables' \ | grep -v '^Writing superblocks and filesystem accounting information' \ | grep -v '^This filesystem will be automatically checked every' \ | grep -v '^180 days, whichever comes first' \ - | sed 's/block groups/block group/' \ + | sed 's/inodes, [0-9]* blocks/inodes, N blocks/' \ + | sed 's/blocks* unused./blocks unused/' \ + | sed 's/block groups*/block groups/' \ | sed 's/ *$//' \ | sed 's/blocks (.*%) reserved/blocks reserved/' \ | grep -v '^$' \ - >image_std.out + >$2.out +} - >image_bb - dd seek=$((kilobytes-1)) bs=1K count=1 </dev/zero of=image_bb >/dev/null 2>&1 || exit 1 - ./busybox mke2fs -F image_bb $kilobytes >image_bb.raw_out 2>&1 || return 1 - cat image_bb.raw_out \ - | grep -v '^mke2fs ' \ - | grep -v '^Maximum filesystem' \ - | grep -v '^warning: .* blocks unused' \ - | grep -v '^Writing inode tables' \ - | grep -v '^Writing superblocks and filesystem accounting information' \ - | grep -v '^This filesystem will be automatically checked every' \ - | grep -v '^180 days, whichever comes first' \ - | sed 's/block groups/block group/' \ - | sed 's/ *$//' \ - | sed 's/blocks (.*%) reserved/blocks reserved/' \ - | grep -v '^$' \ - >image_bb.out +test_mke2fs() { + echo Testing $kilobytes + + run_test '/usr/bin/mke2fs' image_std || return 1 + run_test './busybox mke2fs' image_bb || return 1 diff -ua image_bb.out image_std.out >image.out.diff || { cat image.out.diff return 1 } + + e2fsck -f -n image_bb >/dev/null 2>&1 || { echo "e2fsck error on image_bb"; exit 1; } } +# -:bbox +:standard + +# -6240 inodes, 24908 blocks +# +6240 inodes, 24577 blocks +# -4 block group +# +3 block group +# -1560 inodes per group +# +2080 inodes per group kilobytes=24908 test_mke2fs -kilobytes=81940 test_mke2fs -kilobytes=98392 test_mke2fs -exit + +# -304 inodes, N blocks +# +152 inodes, N blocks +# -304 inodes per group +# +152 inodes per group +kilobytes=1218 test_mke2fs + +# -14464 inodes, N blocks +# +14448 inodes, N blocks +# -8 block group +# +7 block group +# -1808 inodes per group +# +2064 inodes per group +kilobytes=57696 test_mke2fs + +# This size results in "warning: 75 blocks unused" +kilobytes=98380 test_mke2fs + +# -warning: 239 blocks unused. +# +warning: 242 blocks unused. +kilobytes=49395 test_mke2fs while true; do - kilobytes=$(( (RANDOM*RANDOM) % 100000 + 100)) + kilobytes=$(( (RANDOM*RANDOM) % 1000000 + 2000)) test_mke2fs || exit 1 done |