aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2024-04-25 12:39:42 -0400
committerTheodore Ts'o <tytso@mit.edu>2024-04-25 12:39:42 -0400
commitec55a38e448e0f9af9d815a7abfec191ea0fe9d5 (patch)
tree2ef6717110631ba84ef0560334798bd16869b078
parent26efa713eb9b9f6c1f66929ee4683fcce600cb7d (diff)
downloade2fsprogs-ec55a38e448e0f9af9d815a7abfec191ea0fe9d5.tar.gz
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 <tytso@mit.edu>
-rw-r--r--tests/d_corrupt_journal_nr_users/expect2
-rw-r--r--tests/f_jnl_errno/expect.02
-rw-r--r--tests/j_ext_dumpe2fs/expect2
-rw-r--r--tests/m_64bit_flexbg/expect.12
-rw-r--r--tests/m_bigjournal/expect.12
-rw-r--r--tests/m_dasd_bs/expect.12
-rw-r--r--tests/m_desc_size_128/expect.12
-rw-r--r--tests/m_extent_journal/expect.12
-rw-r--r--tests/m_large_file/expect.12
-rw-r--r--tests/m_meta_bg/expect.12
-rw-r--r--tests/m_minrootdir/expect6
-rw-r--r--tests/m_mmp/expect.12
-rw-r--r--tests/m_no_opt/expect.12
-rw-r--r--tests/m_quota/expect.12
-rw-r--r--tests/m_raid_opt/expect.12
-rw-r--r--tests/m_resize_inode_meta_bg/expect.12
-rw-r--r--tests/m_root_owner/expect.12
-rw-r--r--tests/m_root_perms/expect.12
-rw-r--r--tests/m_rootdir/expect2
-rw-r--r--tests/m_rootdir_acl/expect2
-rw-r--r--tests/m_rootgnutar/expect2
-rw-r--r--tests/m_rootpaxtar/expect2
-rw-r--r--tests/m_roottar/expect2
-rw-r--r--tests/m_std/expect.12
-rw-r--r--tests/m_uninit/expect.12
-rw-r--r--tests/r_move_itable/expect10
-rw-r--r--tests/r_move_itable_realloc/expect2
-rw-r--r--tests/r_resize_inode/expect10
-rw-r--r--tests/t_dangerous/expect4
-rw-r--r--tests/t_iexpand_full/expect4
-rw-r--r--tests/t_iexpand_mcsum/expect4
-rw-r--r--tests/u_bounce_io/expect.12
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 656d35c38..6267f9029 100644
--- a/tests/d_corrupt_journal_nr_users/expect
+++ b/tests/d_corrupt_journal_nr_users/expect
@@ -26,7 +26,7 @@ Check interval: 0 (<none>)
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 96fb01a70..9b5b18992 100644
--- a/tests/f_jnl_errno/expect.0
+++ b/tests/f_jnl_errno/expect.0
@@ -26,7 +26,7 @@ Check interval: 0 (<none>)
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 2838bbd15..2f31f438f 100644
--- a/tests/j_ext_dumpe2fs/expect
+++ b/tests/j_ext_dumpe2fs/expect
@@ -37,7 +37,7 @@ Check interval: 0 (<none>)
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 0baea1b45..8540d4d8a 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 4e6674665..4525e60df 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 32883c4c6..87fc62a75 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 54b24e0ab..18405fb82 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 11124e4c9..f7d2c5375 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 955ba77d4..187eff5fc 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 28fd5b11d..7e7b5b62b 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 d2e9a9e28..142c8ee85 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 0edb97d4e..d0c64c583 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 806d29363..181dad239 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 74e38ca30..f0f44b956 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 c1dc61bde..a5ee8140c 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 83c7bc57c..83397c224 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 3b9e3ee8c..19a3d6ee3 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 3b9e3ee8c..19a3d6ee3 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 dbc79772d..d27124d0c 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 57f03e5c0..d3a8101d9 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 5a241b6a8..10def6bc9 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 54a2d4b6c..844d98734 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 78e86c55a..ea96478fb 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 e1d18456f..c552603e2 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 2058de7a9..6596df47e 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 74a00fe0c..f879fedfe 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 8ce56dbc0..65691adfa 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 6756580b9..d3a73d4aa 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 31aaf4fad..6f76ce7b6 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 f99ab4bb4..130e09da2 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 354b1179b..a79d508ee 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 e1d18456f..c552603e2 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