Changes to chmod and lookup tests

diff --git a/t-chmod.sh b/t-chmod.sh
index aea8d7e56da6fbeefe452e96919911160c05cd63..6f4810adc37dff7b8698a1b68f167368b86b22d6 100644 (file)
--- a/t-chmod.sh
+++ b/t-chmod.sh
@@ -59,16 +59,10 @@ function do_chmod {
 
 function test1 {
 # The read-write tests
-if [ $ODF -eq 1 ]; then
-       POPULATE_ODF=0
-fi
+
+init_odf
 ( beforefiles ) | create_hierarchy
-if [ $ODF -eq 1 ]; then
-       setup_odf
-       mount_union "odf=$ODF_DIR" $LOWER_DIR0 $LOWER_DIR1
-else
-       mount_union "" $LOWER_DIR0 $LOWER_DIR1
-fi
+mount_union "" $LOWER_DIR0 $LOWER_DIR1
 
 do_chmod $MOUNTPOINT/a
 do_chmod $MOUNTPOINT/b
@@ -79,26 +73,18 @@ do_chmod $MOUNTPOINT/f
 
 unmount_union
 
-( beforefiles )  | check_hierarchy $TOP_LOWER_DIR
+( beforefiles )  | check_hierarchy
 echo -n "[rw] "
 
-if [ $ODF -eq 1 ]; then
-       discard_odf
-fi
+discard_odf
 }
 
 function test2 {
 # The readonly tests
-if [ $ODF -eq 1 ]; then
-       POPULATE_ODF=0
-fi
+init_odf
 ( beforefiles ) | create_hierarchy
-if [ $ODF -eq 1 ]; then
-       setup_odf
-       mount_union "odf=$ODF_DIR" $LOWER_DIR0 $LOWER_DIR1=ro
-else
-       mount_union "" $LOWER_DIR0 $LOWER_DIR1=ro
-fi
+mount_union "" $LOWER_DIR0 $LOWER_DIR1=ro
+
 do_chmod $MOUNTPOINT/a
 do_chmod $MOUNTPOINT/b
 do_chmod $MOUNTPOINT/c
@@ -106,11 +92,9 @@ do_chmod $MOUNTPOINT/d
 do_chmod $MOUNTPOINT/e
 do_chmod $MOUNTPOINT/f
 unmount_union
-( beforefiles ; afterfiles_ro )  | check_hierarchy $TOP_LOWER_DIR
+( beforefiles ; afterfiles_ro )  | check_hierarchy
 echo -n "[ro] "
-if [ $ODF -eq 1 ]; then
-       discard_odf
-fi
+discard_odf
 }
 
 test1

diff --git a/t-lookup.sh b/t-lookup.sh
index 4a86356a9e8489b4b81e6a10466c5e14a20d9bb1..1b64bdf7fb8e11ce1c1e0b71130ef94ea8d23427 100755 (executable)
--- a/t-lookup.sh
+++ b/t-lookup.sh
@@ -43,7 +43,7 @@ checktype $MOUNTPOINT/b 'd'
 checktype $MOUNTPOINT/c '-'
 
 unmount_union
-( files ; beforefiles ) | check_hierarchy $TOP_LOWER_DIR/b? $ODF_DIR
+( files ; beforefiles ) | check_hierarchy
 discard_odf
 
 complete_test