From: Erez Zadok <ezk@cs.sunysb.edu>
Date: Sun, 2 Dec 2007 19:52:17 +0000 (-0500)
Subject: rename-whiteout: match proper semantics with ODF, accounting for chattr
X-Git-Url: https://git.fsl.cs.sunysb.edu/?a=commitdiff_plain;h=0b1b81e475f14ab1bdebc523a0d6d9bcadcc78c1;p=unionfs-regression-odf.git

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 18b37c7..6c08abc 100755
--- 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