rename-whiteout: match proper semantics with ODF, accounting for chattr

support or lack thereof.

diff --git a/t-rename-whiteout.sh b/t-rename-whiteout.sh
index 18b37c75c7cfb8332973e0e5a839b05c20f562d9..6c08abcf9672ffaeba03b5f37e7127fece955ad0 100755 (executable)
--- a/t-rename-whiteout.sh
+++ b/t-rename-whiteout.sh
@@ -112,9 +112,6 @@ f $LOWER_DIR0/rH.D
 f $LOWER_DIR1/rH.D
 f $LOWER_DIR2/rH.D
 
-w $LOWER_DIR0 rI.S
-f $LOWER_DIR1/rI.S
-f $LOWER_DIR2/rI.S
 f $LOWER_DIR0/rI.D
 f $LOWER_DIR1/rI.D
 f $LOWER_DIR2/rI.D
@@ -141,8 +138,14 @@ w $LOWER_DIR0 rC.S
 w $LOWER_DIR0 rD.S
 w $LOWER_DIR1 rE.S
 w $LOWER_DIR0 rH.S
+w $LOWER_DIR0 rI.S
+f $LOWER_DIR1/rI.S
+f $LOWER_DIR2/rI.S
 FILES
 fi
+test $ODF = 1 && havechattr $LOWER_DIR1 && echo "w $LOWER_DIR0 rI.S"
+test $ODF = 1 && havechattr $LOWER_DIR1 && echo "f $LOWER_DIR1/rI.S"
+test $ODF = 1 && havechattr $LOWER_DIR2 && echo "f $LOWER_DIR2/rI.S"
 }
 
 function afterfiles_ro {
@@ -247,6 +250,7 @@ if havechattr $LOWER_DIR0 ; then
        unmount_union
        ( files ; afterfiles_fail )  | check_hierarchy
        discard_odf
+       echo -n "[chattr] "
 fi
 
 complete_test