Modifed t-rmdir.sh for Unionfs-ODF

diff --git a/t-rmdir.sh b/t-rmdir.sh
index 93a6b586677b2abd705e2adf1118292e6580e3bf..3dcc3bd13490c31e761f437f566cfcf527ea1cd6 100755 (executable)
--- a/t-rmdir.sh
+++ b/t-rmdir.sh
@@ -36,8 +36,8 @@ function beforefiles {
 cat <<FILES
 d $LOWER_DIR0/d1
 d $LOWER_DIR0/d1/d2
-f $LOWER_DIR0/d1/.wh.x
-f $LOWER_DIR0/d1/d2/.wh.d3
+w $LOWER_DIR0 d1/x
+w $LOWER_DIR0 d1/d2/d3
 
 FILES
 }
@@ -46,8 +46,8 @@ FILES
 function afterfiles_rw {
 cat <<FILES
 
-f $LOWER_DIR0/.wh.d1
-f $LOWER_DIR0/.wh.y
+w $LOWER_DIR0 d1
+w $LOWER_DIR0 y
 
 FILES
 }
@@ -57,14 +57,15 @@ FILES
 function afterfiles_ro {
 cat <<FILES
 
-f $LOWER_DIR0/.wh.d1
-f $LOWER_DIR0/.wh.y
+w $LOWER_DIR0 d1
+w $LOWER_DIR0 y
 
 FILES
 }
 
 
 ##### simple tests
+init_odf $LOWER_DIR0 $LOWER_DIR1 $LOWER_DIR2
 ( directories ; beforefiles) | create_hierarchy
 
 mount_union "" $LOWER_DIR0 $LOWER_DIR1 $LOWER_DIR2
@@ -76,11 +77,13 @@ rm -fr $MOUNTPOINT/d1
 rm -fr $MOUNTPOINT/y
 
 unmount_union
-( directories ; afterfiles_rw )  | check_hierarchy $TOP_LOWER_DIR
+( directories ; afterfiles_rw )  | check_hierarchy
+discard_odf
 echo -n "[rw] "
 
 
 #### simple tests
+init_odf $LOWER_DIR0 $LOWER_DIR1=ro $LOWER_DIR2=ro
 ( directories ; beforefiles) | create_hierarchy
 
 mount_union "" $LOWER_DIR0 $LOWER_DIR1=ro $LOWER_DIR2=ro
@@ -92,7 +95,8 @@ rm -fr $MOUNTPOINT/d1
 rm -fr $MOUNTPOINT/y
 
 unmount_union
-( directories ; afterfiles_ro )  | check_hierarchy $TOP_LOWER_DIR
+( directories ; afterfiles_ro )  | check_hierarchy
+discard_odf
 echo -n "[ro] "
 
 complete_test