From 9d5a9fd1fca184155f2e1c33828b0aa86c2426f4 Mon Sep 17 00:00:00 2001
From: Rachita Kothiyal <rachita@dewey.fsl.cs.sunysb.edu>
Date: Tue, 16 Oct 2007 02:34:54 -0400
Subject: [PATCH] Changes to chmod and lookup tests

---
 t-chmod.sh  | 36 ++++++++++--------------------------
 t-lookup.sh |  2 +-
 2 files changed, 11 insertions(+), 27 deletions(-)

diff --git a/t-chmod.sh b/t-chmod.sh
index aea8d7e..6f4810a 100644
--- 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 4a86356..1b64bdf 100755
--- 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
-- 
2.43.0