From 2efdba5866745be27075ebea103c4fdacca8ca9a Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Sun, 6 Apr 2008 17:07:04 -0400 Subject: [PATCH] Fix m_no_opt regression test The m_no_opt test has been silently failing since the addition of mke2fs.conf, since it was trying to use resize_inode on a non-sparse filesystem. Fix it so it works correctly. Signed-off-by: "Theodore Ts'o" --- tests/m_no_opt/expect.1 | 120 +++++++++++++++++++++++++++++++++++++--- tests/m_no_opt/script | 2 +- 2 files changed, 112 insertions(+), 10 deletions(-) diff --git a/tests/m_no_opt/expect.1 b/tests/m_no_opt/expect.1 index 18ce1906..cec95afa 100644 --- a/tests/m_no_opt/expect.1 +++ b/tests/m_no_opt/expect.1 @@ -1,10 +1,112 @@ -mke2fs: reserved online resize blocks not supported on non-sparse filesystem -./test.img: Attempt to read block from filesystem resulted in short read while opening filesystem -features: Filesystem not open - -../e2fsck/e2fsck: Attempt to read block from filesystem resulted in short read while trying to open ./test.img -Could this be a zero-length partition? -Exit status is 8 +Filesystem label= +OS type: Linux +Block size=1024 (log=0) +Fragment size=1024 (log=0) +16384 inodes, 65536 blocks +3276 blocks (5.00%) reserved for the super user +First data block=1 +8 block groups +8192 blocks per group, 8192 fragments per group +2048 inodes per group +Superblock backups stored on blocks: + 8193, 16385, 24577, 32769, 40961, 49153, 57345 -../misc/dumpe2fs: Attempt to read block from filesystem resulted in short read while trying to open ./test.img -Couldn't find valid filesystem superblock. +Writing inode tables: done +Writing superblocks and filesystem accounting information: done + +Filesystem features:(none) + +Pass 1: Checking inodes, blocks, and sizes +Pass 2: Checking directory structure +Pass 3: Checking directory connectivity +Pass 4: Checking reference counts +Pass 5: Checking group summary information +test_filesys: 11/16384 files (0.0% non-contiguous), 2094/65536 blocks +Exit status is 0 + +Filesystem volume name: +Last mounted on: +Filesystem magic number: 0xEF53 +Filesystem revision #: 1 (dynamic) +Filesystem features: (none) +Default mount options: (none) +Filesystem state: clean +Errors behavior: Continue +Filesystem OS type: Linux +Inode count: 16384 +Block count: 65536 +Reserved block count: 3276 +Free blocks: 63442 +Free inodes: 16373 +First block: 1 +Block size: 1024 +Fragment size: 1024 +Blocks per group: 8192 +Fragments per group: 8192 +Inodes per group: 2048 +Inode blocks per group: 256 +Mount count: 0 +Check interval: 15552000 (6 months) +Reserved blocks uid: 0 +Reserved blocks gid: 0 +First inode: 11 +Inode size: 128 +Default directory hash: tea + + +Group 0: (Blocks 1-8192) + Primary superblock at 1, Group descriptors at 2-2 + Block bitmap at 3 (+2), Inode bitmap at 4 (+3) + Inode table at 5-260 (+4) + 7919 free blocks, 2037 free inodes, 2 directories + Free blocks: 274-8192 + Free inodes: 12-2048 +Group 1: (Blocks 8193-16384) + Backup superblock at 8193, Group descriptors at 8194-8194 + Block bitmap at 8195 (+2), Inode bitmap at 8196 (+3) + Inode table at 8197-8452 (+4) + 7932 free blocks, 2048 free inodes, 0 directories + Free blocks: 8453-16384 + Free inodes: 2049-4096 +Group 2: (Blocks 16385-24576) + Backup superblock at 16385, Group descriptors at 16386-16386 + Block bitmap at 16387 (+2), Inode bitmap at 16388 (+3) + Inode table at 16389-16644 (+4) + 7932 free blocks, 2048 free inodes, 0 directories + Free blocks: 16645-24576 + Free inodes: 4097-6144 +Group 3: (Blocks 24577-32768) + Backup superblock at 24577, Group descriptors at 24578-24578 + Block bitmap at 24579 (+2), Inode bitmap at 24580 (+3) + Inode table at 24581-24836 (+4) + 7932 free blocks, 2048 free inodes, 0 directories + Free blocks: 24837-32768 + Free inodes: 6145-8192 +Group 4: (Blocks 32769-40960) + Backup superblock at 32769, Group descriptors at 32770-32770 + Block bitmap at 32771 (+2), Inode bitmap at 32772 (+3) + Inode table at 32773-33028 (+4) + 7932 free blocks, 2048 free inodes, 0 directories + Free blocks: 33029-40960 + Free inodes: 8193-10240 +Group 5: (Blocks 40961-49152) + Backup superblock at 40961, Group descriptors at 40962-40962 + Block bitmap at 40963 (+2), Inode bitmap at 40964 (+3) + Inode table at 40965-41220 (+4) + 7932 free blocks, 2048 free inodes, 0 directories + Free blocks: 41221-49152 + Free inodes: 10241-12288 +Group 6: (Blocks 49153-57344) + Backup superblock at 49153, Group descriptors at 49154-49154 + Block bitmap at 49155 (+2), Inode bitmap at 49156 (+3) + Inode table at 49157-49412 (+4) + 7932 free blocks, 2048 free inodes, 0 directories + Free blocks: 49413-57344 + Free inodes: 12289-14336 +Group 7: (Blocks 57345-65535) + Backup superblock at 57345, Group descriptors at 57346-57346 + Block bitmap at 57347 (+2), Inode bitmap at 57348 (+3) + Inode table at 57349-57604 (+4) + 7931 free blocks, 2048 free inodes, 0 directories + Free blocks: 57605-65535 + Free inodes: 14337-16384 diff --git a/tests/m_no_opt/script b/tests/m_no_opt/script index e6244b2c..6d1d0ebc 100644 --- a/tests/m_no_opt/script +++ b/tests/m_no_opt/script @@ -1,4 +1,4 @@ DESCRIPTION="no filesystem extensions" FS_SIZE=65536 -MKE2FS_OPTS="-O ^sparse_super,^filetype" +MKE2FS_OPTS="-O ^sparse_super,^filetype,^resize_inode,^dir_index,^ext_attr" . $cmd_dir/run_mke2fs