From 49912d6f47311d087ce007129a945e48199bfbac Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Sat, 1 Feb 2020 17:17:28 -0800 Subject: chattr.test/lsattr.test: fix on more kernels/fses. The tests now pass on all the systems available to me (cloud Android with encrypted f2fs, current AOSP with regular f2fs, and current Debian testing with ext4). --- tests/chattr.test | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/chattr.test') diff --git a/tests/chattr.test b/tests/chattr.test index e3d8d547..2e580cfb 100755 --- a/tests/chattr.test +++ b/tests/chattr.test @@ -13,12 +13,12 @@ fi function clean() { # We don't know whether the fs will have extents (e, typically true on the - # desktop) or be encrypted (E, typically true on Android), so strip out both - # the long and short forms of those. + # desktop) or be encrypted (E, typically true on Android), or have data + # inlined in the inode (N), or use indexed directories, so strip those out. # We also don't want to rely on chattr(1) to set a known version number or # project number, so blank out any numbers. - sed 's/, Encrypted//; s/-E-/---/; s/, Extents//; s/-e-/---/' | \ - sed -E 's/[0-9]+/_/g' + sed -E 's/, (Encrypted|Extents|Indexed_directory|Inline_Data)//g;' | + sed -E 's/[EeIN]-/--/g; s/[0-9]+/_/g' } mkdir testattr -- cgit v1.2.3