From ec55a38e448e0f9af9d815a7abfec191ea0fe9d5 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Thu, 25 Apr 2024 12:39:42 -0400 Subject: [PATCH] tests: fix expect scripts after removing tabs from tune2fs -l output Fixes: 54765493af7d ("libe2p: remove tabs from "Inode size" and "Journal device" in `tune2fs -l` output") Signed-off-by: Theodore Ts'o --- tests/d_corrupt_journal_nr_users/expect | 2 +- tests/f_jnl_errno/expect.0 | 2 +- tests/j_ext_dumpe2fs/expect | 2 +- tests/m_64bit_flexbg/expect.1 | 2 +- tests/m_bigjournal/expect.1 | 2 +- tests/m_dasd_bs/expect.1 | 2 +- tests/m_desc_size_128/expect.1 | 2 +- tests/m_extent_journal/expect.1 | 2 +- tests/m_large_file/expect.1 | 2 +- tests/m_meta_bg/expect.1 | 2 +- tests/m_minrootdir/expect | 6 +++--- tests/m_mmp/expect.1 | 2 +- tests/m_no_opt/expect.1 | 2 +- tests/m_quota/expect.1 | 2 +- tests/m_raid_opt/expect.1 | 2 +- tests/m_resize_inode_meta_bg/expect.1 | 2 +- tests/m_root_owner/expect.1 | 2 +- tests/m_root_perms/expect.1 | 2 +- tests/m_rootdir/expect | 2 +- tests/m_rootdir_acl/expect | 2 +- tests/m_rootgnutar/expect | 2 +- tests/m_rootpaxtar/expect | 2 +- tests/m_roottar/expect | 2 +- tests/m_std/expect.1 | 2 +- tests/m_uninit/expect.1 | 2 +- tests/r_move_itable/expect | 10 +++++----- tests/r_move_itable_realloc/expect | 2 +- tests/r_resize_inode/expect | 10 +++++----- tests/t_dangerous/expect | 4 ++-- tests/t_iexpand_full/expect | 4 ++-- tests/t_iexpand_mcsum/expect | 4 ++-- tests/u_bounce_io/expect.1 | 2 +- 32 files changed, 45 insertions(+), 45 deletions(-) diff --git a/tests/d_corrupt_journal_nr_users/expect b/tests/d_corrupt_journal_nr_users/expect index 656d35c..6267f90 100644 --- a/tests/d_corrupt_journal_nr_users/expect +++ b/tests/d_corrupt_journal_nr_users/expect @@ -26,7 +26,7 @@ Check interval: 0 () Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 256 +Inode size: 256 Required extra isize: 32 Desired extra isize: 32 Journal inode: 8 diff --git a/tests/f_jnl_errno/expect.0 b/tests/f_jnl_errno/expect.0 index 96fb01a..9b5b189 100644 --- a/tests/f_jnl_errno/expect.0 +++ b/tests/f_jnl_errno/expect.0 @@ -26,7 +26,7 @@ Check interval: 0 () Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 128 +Inode size: 128 Journal inode: 8 Default directory hash: half_md4 Journal backup: inode blocks diff --git a/tests/j_ext_dumpe2fs/expect b/tests/j_ext_dumpe2fs/expect index 2838bbd..2f31f43 100644 --- a/tests/j_ext_dumpe2fs/expect +++ b/tests/j_ext_dumpe2fs/expect @@ -37,7 +37,7 @@ Check interval: 0 () Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 256 +Inode size: 256 Required extra isize: 28 Desired extra isize: 28 Default directory hash: half_md4 diff --git a/tests/m_64bit_flexbg/expect.1 b/tests/m_64bit_flexbg/expect.1 index 0baea1b..8540d4d 100644 --- a/tests/m_64bit_flexbg/expect.1 +++ b/tests/m_64bit_flexbg/expect.1 @@ -42,7 +42,7 @@ Check interval: 15552000 (6 months) Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 256 +Inode size: 256 Required extra isize: 32 Desired extra isize: 32 Default directory hash: half_md4 diff --git a/tests/m_bigjournal/expect.1 b/tests/m_bigjournal/expect.1 index 4e66746..4525e60 100644 --- a/tests/m_bigjournal/expect.1 +++ b/tests/m_bigjournal/expect.1 @@ -35,7 +35,7 @@ Check interval: 15552000 (6 months) Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 256 +Inode size: 256 Required extra isize: 32 Desired extra isize: 32 Journal inode: 8 diff --git a/tests/m_dasd_bs/expect.1 b/tests/m_dasd_bs/expect.1 index 32883c4..87fc62a 100644 --- a/tests/m_dasd_bs/expect.1 +++ b/tests/m_dasd_bs/expect.1 @@ -42,7 +42,7 @@ Check interval: 15552000 (6 months) Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 256 +Inode size: 256 Required extra isize: 32 Desired extra isize: 32 Default directory hash: half_md4 diff --git a/tests/m_desc_size_128/expect.1 b/tests/m_desc_size_128/expect.1 index 54b24e0..18405fb 100644 --- a/tests/m_desc_size_128/expect.1 +++ b/tests/m_desc_size_128/expect.1 @@ -43,7 +43,7 @@ Check interval: 15552000 (6 months) Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 256 +Inode size: 256 Required extra isize: 32 Desired extra isize: 32 Default directory hash: half_md4 diff --git a/tests/m_extent_journal/expect.1 b/tests/m_extent_journal/expect.1 index 11124e4..f7d2c53 100644 --- a/tests/m_extent_journal/expect.1 +++ b/tests/m_extent_journal/expect.1 @@ -43,7 +43,7 @@ Check interval: 15552000 (6 months) Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 256 +Inode size: 256 Required extra isize: 32 Desired extra isize: 32 Journal inode: 8 diff --git a/tests/m_large_file/expect.1 b/tests/m_large_file/expect.1 index 955ba77..187eff5 100644 --- a/tests/m_large_file/expect.1 +++ b/tests/m_large_file/expect.1 @@ -40,7 +40,7 @@ Check interval: 15552000 (6 months) Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 256 +Inode size: 256 Required extra isize: 32 Desired extra isize: 32 Default directory hash: half_md4 diff --git a/tests/m_meta_bg/expect.1 b/tests/m_meta_bg/expect.1 index 28fd5b1..7e7b5b6 100644 --- a/tests/m_meta_bg/expect.1 +++ b/tests/m_meta_bg/expect.1 @@ -41,7 +41,7 @@ Check interval: 15552000 (6 months) Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 256 +Inode size: 256 Required extra isize: 32 Desired extra isize: 32 Default directory hash: half_md4 diff --git a/tests/m_minrootdir/expect b/tests/m_minrootdir/expect index d2e9a9e..142c8ee 100644 --- a/tests/m_minrootdir/expect +++ b/tests/m_minrootdir/expect @@ -28,7 +28,7 @@ Check interval: 15552000 (6 months) Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 256 +Inode size: 256 Required extra isize: 32 Desired extra isize: 32 Default directory hash: half_md4 @@ -140,7 +140,7 @@ Check interval: 15552000 (6 months) Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 256 +Inode size: 256 Required extra isize: 32 Desired extra isize: 32 Default directory hash: half_md4 @@ -194,7 +194,7 @@ Check interval: 15552000 (6 months) Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 256 +Inode size: 256 Required extra isize: 32 Desired extra isize: 32 Default directory hash: half_md4 diff --git a/tests/m_mmp/expect.1 b/tests/m_mmp/expect.1 index 0edb97d..d0c64c5 100644 --- a/tests/m_mmp/expect.1 +++ b/tests/m_mmp/expect.1 @@ -43,7 +43,7 @@ Check interval: 15552000 (6 months) Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 256 +Inode size: 256 Required extra isize: 32 Desired extra isize: 32 Default directory hash: half_md4 diff --git a/tests/m_no_opt/expect.1 b/tests/m_no_opt/expect.1 index 806d293..181dad2 100644 --- a/tests/m_no_opt/expect.1 +++ b/tests/m_no_opt/expect.1 @@ -41,7 +41,7 @@ Check interval: 15552000 (6 months) Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 256 +Inode size: 256 Required extra isize: 32 Desired extra isize: 32 Default directory hash: half_md4 diff --git a/tests/m_quota/expect.1 b/tests/m_quota/expect.1 index 74e38ca..f0f44b9 100644 --- a/tests/m_quota/expect.1 +++ b/tests/m_quota/expect.1 @@ -42,7 +42,7 @@ Check interval: 15552000 (6 months) Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 256 +Inode size: 256 Required extra isize: 32 Desired extra isize: 32 Default directory hash: half_md4 diff --git a/tests/m_raid_opt/expect.1 b/tests/m_raid_opt/expect.1 index c1dc61b..a5ee814 100644 --- a/tests/m_raid_opt/expect.1 +++ b/tests/m_raid_opt/expect.1 @@ -43,7 +43,7 @@ Check interval: 15552000 (6 months) Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 256 +Inode size: 256 Required extra isize: 32 Desired extra isize: 32 Default directory hash: half_md4 diff --git a/tests/m_resize_inode_meta_bg/expect.1 b/tests/m_resize_inode_meta_bg/expect.1 index 83c7bc5..83397c2 100644 --- a/tests/m_resize_inode_meta_bg/expect.1 +++ b/tests/m_resize_inode_meta_bg/expect.1 @@ -44,7 +44,7 @@ Check interval: 15552000 (6 months) Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 256 +Inode size: 256 Required extra isize: 32 Desired extra isize: 32 Journal inode: 8 diff --git a/tests/m_root_owner/expect.1 b/tests/m_root_owner/expect.1 index 3b9e3ee..19a3d6e 100644 --- a/tests/m_root_owner/expect.1 +++ b/tests/m_root_owner/expect.1 @@ -40,7 +40,7 @@ Check interval: 15552000 (6 months) Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 256 +Inode size: 256 Required extra isize: 32 Desired extra isize: 32 Default directory hash: half_md4 diff --git a/tests/m_root_perms/expect.1 b/tests/m_root_perms/expect.1 index 3b9e3ee..19a3d6e 100644 --- a/tests/m_root_perms/expect.1 +++ b/tests/m_root_perms/expect.1 @@ -40,7 +40,7 @@ Check interval: 15552000 (6 months) Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 256 +Inode size: 256 Required extra isize: 32 Desired extra isize: 32 Default directory hash: half_md4 diff --git a/tests/m_rootdir/expect b/tests/m_rootdir/expect index dbc7977..d27124d 100644 --- a/tests/m_rootdir/expect +++ b/tests/m_rootdir/expect @@ -28,7 +28,7 @@ Check interval: 15552000 (6 months) Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 256 +Inode size: 256 Required extra isize: 32 Desired extra isize: 32 Journal inode: 8 diff --git a/tests/m_rootdir_acl/expect b/tests/m_rootdir_acl/expect index 57f03e5..d3a8101 100644 --- a/tests/m_rootdir_acl/expect +++ b/tests/m_rootdir_acl/expect @@ -28,7 +28,7 @@ Check interval: 15552000 (6 months) Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 512 +Inode size: 512 Required extra isize: 32 Desired extra isize: 32 Journal inode: 8 diff --git a/tests/m_rootgnutar/expect b/tests/m_rootgnutar/expect index 5a241b6..10def6b 100644 --- a/tests/m_rootgnutar/expect +++ b/tests/m_rootgnutar/expect @@ -30,7 +30,7 @@ Check interval: 15552000 (6 months) Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 256 +Inode size: 256 Required extra isize: 32 Desired extra isize: 32 Journal inode: 8 diff --git a/tests/m_rootpaxtar/expect b/tests/m_rootpaxtar/expect index 54a2d4b..844d987 100644 --- a/tests/m_rootpaxtar/expect +++ b/tests/m_rootpaxtar/expect @@ -28,7 +28,7 @@ Check interval: 15552000 (6 months) Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 256 +Inode size: 256 Required extra isize: 32 Desired extra isize: 32 Journal inode: 8 diff --git a/tests/m_roottar/expect b/tests/m_roottar/expect index 78e86c5..ea96478 100644 --- a/tests/m_roottar/expect +++ b/tests/m_roottar/expect @@ -28,7 +28,7 @@ Check interval: 15552000 (6 months) Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 256 +Inode size: 256 Required extra isize: 32 Desired extra isize: 32 Journal inode: 8 diff --git a/tests/m_std/expect.1 b/tests/m_std/expect.1 index e1d1845..c552603 100644 --- a/tests/m_std/expect.1 +++ b/tests/m_std/expect.1 @@ -42,7 +42,7 @@ Check interval: 15552000 (6 months) Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 256 +Inode size: 256 Required extra isize: 32 Desired extra isize: 32 Default directory hash: half_md4 diff --git a/tests/m_uninit/expect.1 b/tests/m_uninit/expect.1 index 2058de7..6596df4 100644 --- a/tests/m_uninit/expect.1 +++ b/tests/m_uninit/expect.1 @@ -42,7 +42,7 @@ Check interval: 15552000 (6 months) Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 256 +Inode size: 256 Required extra isize: 32 Desired extra isize: 32 Default directory hash: half_md4 diff --git a/tests/r_move_itable/expect b/tests/r_move_itable/expect index 74a00fe..f879fed 100644 --- a/tests/r_move_itable/expect +++ b/tests/r_move_itable/expect @@ -27,7 +27,7 @@ Check interval: 15552000 (6 months) Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 256 +Inode size: 256 Required extra isize: 32 Desired extra isize: 32 Default directory hash: half_md4 @@ -104,7 +104,7 @@ Check interval: 15552000 (6 months) Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 256 +Inode size: 256 Required extra isize: 32 Desired extra isize: 32 Default directory hash: half_md4 @@ -399,7 +399,7 @@ Check interval: 15552000 (6 months) Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 256 +Inode size: 256 Required extra isize: 32 Desired extra isize: 32 Default directory hash: half_md4 @@ -931,7 +931,7 @@ Check interval: 15552000 (6 months) Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 256 +Inode size: 256 Required extra isize: 32 Desired extra isize: 32 Default directory hash: half_md4 @@ -1694,7 +1694,7 @@ Check interval: 15552000 (6 months) Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 256 +Inode size: 256 Required extra isize: 32 Desired extra isize: 32 Default directory hash: half_md4 diff --git a/tests/r_move_itable_realloc/expect b/tests/r_move_itable_realloc/expect index 8ce56db..65691ad 100644 --- a/tests/r_move_itable_realloc/expect +++ b/tests/r_move_itable_realloc/expect @@ -44,7 +44,7 @@ Check interval: 15552000 (6 months) Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 256 +Inode size: 256 Required extra isize: 32 Desired extra isize: 32 Journal inode: 8 diff --git a/tests/r_resize_inode/expect b/tests/r_resize_inode/expect index 6756580..d3a73d4 100644 --- a/tests/r_resize_inode/expect +++ b/tests/r_resize_inode/expect @@ -28,7 +28,7 @@ Check interval: 15552000 (6 months) Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 256 +Inode size: 256 Required extra isize: 32 Desired extra isize: 32 Default directory hash: half_md4 @@ -183,7 +183,7 @@ Check interval: 15552000 (6 months) Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 256 +Inode size: 256 Required extra isize: 32 Desired extra isize: 32 Default directory hash: half_md4 @@ -622,7 +622,7 @@ Check interval: 15552000 (6 months) Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 256 +Inode size: 256 Required extra isize: 32 Desired extra isize: 32 Default directory hash: half_md4 @@ -1071,7 +1071,7 @@ Check interval: 15552000 (6 months) Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 256 +Inode size: 256 Required extra isize: 32 Desired extra isize: 32 Default directory hash: half_md4 @@ -1229,7 +1229,7 @@ Check interval: 15552000 (6 months) Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 256 +Inode size: 256 Required extra isize: 32 Desired extra isize: 32 Default directory hash: half_md4 diff --git a/tests/t_dangerous/expect b/tests/t_dangerous/expect index 31aaf4f..6f76ce7 100644 --- a/tests/t_dangerous/expect +++ b/tests/t_dangerous/expect @@ -84,10 +84,10 @@ Change in FS metadata: @@ -1,3 +1,3 @@ -Filesystem UUID: 6fc3daa4-180d-4f2b-a6f2-f7a5efb79bcf -Filesystem features: has_journal ext_attr resize_inode dir_index filetype extent 64bit sparse_super large_file huge_file uninit_bg dir_nlink extra_isize --Inode size: 256 +-Inode size: 256 +Filesystem UUID: f0f0f0f0-f0f0-f0f0-f0f0-f0f0f0f0f0f0 +Filesystem features: has_journal ext_attr resize_inode dir_index filetype extent 64bit sparse_super large_file huge_file dir_nlink extra_isize metadata_csum -+Inode size: 512 ++Inode size: 512 Pass 1: Checking inodes, blocks, and sizes Pass 2: Checking directory structure Pass 3: Checking directory connectivity diff --git a/tests/t_iexpand_full/expect b/tests/t_iexpand_full/expect index f99ab4b..130e09d 100644 --- a/tests/t_iexpand_full/expect +++ b/tests/t_iexpand_full/expect @@ -28,8 +28,8 @@ Change in FS metadata: -Inode blocks per group: 128 +Inode blocks per group: 256 @@ -29 +29 @@ --Inode size: 128 -+Inode size: 256 +-Inode size: 128 ++Inode size: 256 Pass 1: Checking inodes, blocks, and sizes Pass 2: Checking directory structure Pass 3: Checking directory connectivity diff --git a/tests/t_iexpand_mcsum/expect b/tests/t_iexpand_mcsum/expect index 354b117..a79d508 100644 --- a/tests/t_iexpand_mcsum/expect +++ b/tests/t_iexpand_mcsum/expect @@ -44,8 +44,8 @@ Change in FS metadata: -Inode blocks per group: 128 +Inode blocks per group: 256 @@ -28 +28 @@ --Inode size: 128 -+Inode size: 256 +-Inode size: 128 ++Inode size: 256 @@ -31,0 +32 @@ +Checksum type: crc32c Pass 1: Checking inodes, blocks, and sizes diff --git a/tests/u_bounce_io/expect.1 b/tests/u_bounce_io/expect.1 index e1d1845..c552603 100644 --- a/tests/u_bounce_io/expect.1 +++ b/tests/u_bounce_io/expect.1 @@ -42,7 +42,7 @@ Check interval: 15552000 (6 months) Reserved blocks uid: 0 Reserved blocks gid: 0 First inode: 11 -Inode size: 256 +Inode size: 256 Required extra isize: 32 Desired extra isize: 32 Default directory hash: half_md4 -- 1.8.3.1