diff options
author | Theodore Ts'o <tytso@mit.edu> | 2022-08-06 02:37:24 -0400 |
---|---|---|
committer | Theodore Ts'o <tytso@mit.edu> | 2022-08-06 02:37:24 -0400 |
commit | 88ac43ed6a46caa2851b4a60b838bba9f151bd09 (patch) | |
tree | 5767da807c7aaf55d3befd9c3315b59cbcef3291 /tests | |
parent | 96185e9bef1dca5a3b7d93f244d65107aad5f37f (diff) | |
parent | 80e1504f2ce33c9ebc5045009c7bcde9315526c0 (diff) | |
download | e2fsprogs-88ac43ed6a46caa2851b4a60b838bba9f151bd09.tar.gz |
Merge branch 'maint' into next
Diffstat (limited to 'tests')
-rw-r--r-- | tests/f_bad_encryption/expect.1 | 6 | ||||
-rw-r--r-- | tests/f_badroot/expect.1 | 2 | ||||
-rw-r--r-- | tests/f_encrypted_lpf/expect.1 | 4 | ||||
-rw-r--r-- | tests/f_expand/expect.1.gz | bin | 13462 -> 13461 bytes | |||
-rw-r--r-- | tests/f_lpf2/expect.1 | 4 | ||||
-rw-r--r-- | tests/f_noroot/expect.1 | 4 | ||||
-rw-r--r-- | tests/f_orphan_dotdot_ft/expect.1 | 6 | ||||
-rw-r--r-- | tests/f_rebuild_csum_rootdir/expect.1 | 2 | ||||
-rw-r--r-- | tests/f_recnect_bad/expect.1 | 2 | ||||
-rw-r--r-- | tests/f_resize_inode_meta_bg/expect.1 | 2 |
10 files changed, 16 insertions, 16 deletions
diff --git a/tests/f_bad_encryption/expect.1 b/tests/f_bad_encryption/expect.1 index d743e66f..70270959 100644 --- a/tests/f_bad_encryption/expect.1 +++ b/tests/f_bad_encryption/expect.1 @@ -54,13 +54,13 @@ Encrypted entry '\M-ggCeM-/?M-^BM-{(M-^OM-9M-^QQAM-^N=M-c^Mo' in /edir (12) refe Clear? yes Pass 3: Checking directory connectivity -Unconnected directory inode 18 (/edir/???) +Unconnected directory inode 18 (was in /edir) Connect to /lost+found? yes -Unconnected directory inode 24 (/edir/???) +Unconnected directory inode 24 (was in /edir) Connect to /lost+found? yes -Unconnected directory inode 27 (/edir/???) +Unconnected directory inode 27 (was in /edir) Connect to /lost+found? yes Pass 4: Checking reference counts diff --git a/tests/f_badroot/expect.1 b/tests/f_badroot/expect.1 index f9d01e57..ff924268 100644 --- a/tests/f_badroot/expect.1 +++ b/tests/f_badroot/expect.1 @@ -9,7 +9,7 @@ Entry '..' in <2>/<11> (11) has deleted/unused inode 2. Clear? yes Pass 3: Checking directory connectivity Root inode not allocated. Allocate? yes -Unconnected directory inode 11 (...) +Unconnected directory inode 11 (was in /) Connect to /lost+found? yes /lost+found not found. Create? yes diff --git a/tests/f_encrypted_lpf/expect.1 b/tests/f_encrypted_lpf/expect.1 index 7e215b7d..63ac5f3b 100644 --- a/tests/f_encrypted_lpf/expect.1 +++ b/tests/f_encrypted_lpf/expect.1 @@ -1,7 +1,7 @@ Pass 1: Checking inodes, blocks, and sizes Pass 2: Checking directory structure Pass 3: Checking directory connectivity -Unconnected directory inode 12 (/???) +Unconnected directory inode 12 (was in /) Connect to /lost+found? yes /lost+found is encrypted @@ -13,7 +13,7 @@ Restarting e2fsck from the beginning... Pass 1: Checking inodes, blocks, and sizes Pass 2: Checking directory structure Pass 3: Checking directory connectivity -Unconnected directory inode 11 (/???) +Unconnected directory inode 11 (was in /) Connect to /lost+found? yes Pass 3A: Optimizing directories diff --git a/tests/f_expand/expect.1.gz b/tests/f_expand/expect.1.gz Binary files differindex 1015e155..81fe7dd6 100644 --- a/tests/f_expand/expect.1.gz +++ b/tests/f_expand/expect.1.gz diff --git a/tests/f_lpf2/expect.1 b/tests/f_lpf2/expect.1 index 633586cc..ab5d9ba3 100644 --- a/tests/f_lpf2/expect.1 +++ b/tests/f_lpf2/expect.1 @@ -1,12 +1,12 @@ Pass 1: Checking inodes, blocks, and sizes Pass 2: Checking directory structure Pass 3: Checking directory connectivity -Unconnected directory inode 12 (/???) +Unconnected directory inode 12 (was in /) Connect to /lost+found? yes /lost+found not found. Create? yes -Unconnected directory inode 13 (/???) +Unconnected directory inode 13 (was in /) Connect to /lost+found? yes Pass 4: Checking reference counts diff --git a/tests/f_noroot/expect.1 b/tests/f_noroot/expect.1 index 7bdd7cba..f8f652ec 100644 --- a/tests/f_noroot/expect.1 +++ b/tests/f_noroot/expect.1 @@ -11,12 +11,12 @@ Entry '..' in /foo (12) has deleted/unused inode 2. Clear? yes Pass 3: Checking directory connectivity Root inode not allocated. Allocate? yes -Unconnected directory inode 11 (...) +Unconnected directory inode 11 (was in /) Connect to /lost+found? yes /lost+found not found. Create? yes -Unconnected directory inode 12 (...) +Unconnected directory inode 12 (was in /lost+found) Connect to /lost+found? yes Pass 4: Checking reference counts diff --git a/tests/f_orphan_dotdot_ft/expect.1 b/tests/f_orphan_dotdot_ft/expect.1 index 6a1373f2..60924958 100644 --- a/tests/f_orphan_dotdot_ft/expect.1 +++ b/tests/f_orphan_dotdot_ft/expect.1 @@ -17,13 +17,13 @@ Entry '..' in <12>/<15> (15) has an incorrect filetype (was 2, should be 6). Fix? yes Pass 3: Checking directory connectivity -Unconnected directory inode 13 (<12>/<13>) +Unconnected directory inode 13 (was in <12>) Connect to /lost+found? yes -Unconnected directory inode 14 (<12>/<14>) +Unconnected directory inode 14 (was in <12>) Connect to /lost+found? yes -Unconnected directory inode 15 (<12>/<15>) +Unconnected directory inode 15 (was in <12>) Connect to /lost+found? yes Pass 4: Checking reference counts diff --git a/tests/f_rebuild_csum_rootdir/expect.1 b/tests/f_rebuild_csum_rootdir/expect.1 index 91e6027d..063fb8cc 100644 --- a/tests/f_rebuild_csum_rootdir/expect.1 +++ b/tests/f_rebuild_csum_rootdir/expect.1 @@ -13,7 +13,7 @@ Pass 3: Checking directory connectivity '..' in / (2) is <The NULL inode> (0), should be / (2). Fix? yes -Unconnected directory inode 11 (/???) +Unconnected directory inode 11 (was in /) Connect to /lost+found? yes /lost+found not found. Create? yes diff --git a/tests/f_recnect_bad/expect.1 b/tests/f_recnect_bad/expect.1 index 97ffcc52..685eedfe 100644 --- a/tests/f_recnect_bad/expect.1 +++ b/tests/f_recnect_bad/expect.1 @@ -12,7 +12,7 @@ i_faddr for inode 13 (/test/???) is 12, should be zero. Clear? yes Pass 3: Checking directory connectivity -Unconnected directory inode 13 (/test/???) +Unconnected directory inode 13 (was in /test) Connect to /lost+found? yes Pass 4: Checking reference counts diff --git a/tests/f_resize_inode_meta_bg/expect.1 b/tests/f_resize_inode_meta_bg/expect.1 index 769f71ae..e248083f 100644 --- a/tests/f_resize_inode_meta_bg/expect.1 +++ b/tests/f_resize_inode_meta_bg/expect.1 @@ -45,7 +45,7 @@ Pass 3: Checking directory connectivity '..' in / (2) is <The NULL inode> (0), should be / (2). Fix? yes -Unconnected directory inode 11 (/???) +Unconnected directory inode 11 (was in /) Connect to /lost+found? yes /lost+found not found. Create? yes |