Regression-ODF: Sync up t-rmdir.sh with the Non-odf regression

suite.

diff --git a/t-rmdir.sh b/t-rmdir.sh
index 3dcc3bd13490c31e761f437f566cfcf527ea1cd6..a39170e5b0f218286f76cf5bb13b64638fa9d21b 100755 (executable)
--- a/t-rmdir.sh
+++ b/t-rmdir.sh
@@ -7,9 +7,7 @@ function directories {
 cat <<FILES
 d $TOP_LOWER_DIR
 d $LOWER_DIR0
-d $LOWER_DIR0/d6
 d $LOWER_DIR1
-d $LOWER_DIR1/d5
 d $LOWER_DIR1/d1
 d $LOWER_DIR1/d1/d2
 d $LOWER_DIR1/d1/d2/d3
@@ -18,7 +16,6 @@ f $LOWER_DIR1/d1/d2/d3/b
 f $LOWER_DIR1/d1/d2/d3/c
 d $LOWER_DIR1/d1/d2/d3/d4
 d $LOWER_DIR2
-d $LOWER_DIR2/d5
 d $LOWER_DIR2/d1
 d $LOWER_DIR2/d1/d2
 d $LOWER_DIR2/d1/d2/d3
@@ -35,6 +32,10 @@ FILES
 function beforefiles {
 cat <<FILES
 d $LOWER_DIR0/d1
+d $LOWER_DIR0/d6
+d $LOWER_DIR1/d5
+d $LOWER_DIR2/d5
+d $LOWER_DIR2/d7
 d $LOWER_DIR0/d1/d2
 w $LOWER_DIR0 d1/x
 w $LOWER_DIR0 d1/d2/d3
@@ -47,20 +48,35 @@ function afterfiles_rw {
 cat <<FILES
 
 w $LOWER_DIR0 d1
+FILES
+if [ $ODF -eq 0 ]; then
+cat <<FILES
+w $LOWER_DIR1 d5
+d $LOWER_DIR2/d5
+FILES
+else
+cat <<FILES
 w $LOWER_DIR0 y
-
 FILES
+fi
 }
 
 
-
 function afterfiles_ro {
 cat <<FILES
 
+d $LOWER_DIR1/d5
+d $LOWER_DIR2/d5
+d $LOWER_DIR2/d7
 w $LOWER_DIR0 d1
+w $LOWER_DIR0 d5
+w $LOWER_DIR0 d7
+FILES
+if [ $ODF -eq 1 ]; then
+cat <<FILES
 w $LOWER_DIR0 y
-
 FILES
+fi
 }
 
 
@@ -73,6 +89,9 @@ mount_union "" $LOWER_DIR0 $LOWER_DIR1 $LOWER_DIR2
 mkdir $MOUNTPOINT/y
 mkdir $MOUNTPOINT/d1/x
 mkdir $MOUNTPOINT/d1/d2/d3
+rmdir $MOUNTPOINT/d5
+rmdir $MOUNTPOINT/d6
+rmdir $MOUNTPOINT/d7
 rm -fr $MOUNTPOINT/d1
 rm -fr $MOUNTPOINT/y
 
@@ -91,6 +110,9 @@ mount_union "" $LOWER_DIR0 $LOWER_DIR1=ro $LOWER_DIR2=ro
 mkdir $MOUNTPOINT/y
 mkdir $MOUNTPOINT/d1/x
 mkdir $MOUNTPOINT/d1/d2/d3
+rmdir $MOUNTPOINT/d5
+rmdir $MOUNTPOINT/d6
+rmdir $MOUNTPOINT/d7
 rm -fr $MOUNTPOINT/d1
 rm -fr $MOUNTPOINT/y