Import changes to t-symlink.sh from unionfs regression.

Signed-off-by: Rachita Kothiyal <rachita@fsl.cs.sunysb.edu>

diff --git a/t-symlink.sh b/t-symlink.sh
index 3756205c9ecda4bbf3b02d4f25d5473f69dcaa69..7860ebaaabf81c63ae25fa0d8d5e60200b07bec9 100755 (executable)
--- a/t-symlink.sh
+++ b/t-symlink.sh
@@ -42,22 +42,28 @@ w $LOWER_DIR1 d1/d2/d3/d4/c
 FILES
 }
 
-
 function afterfiles_rw {
 cat <<FILES
 f $LOWER_DIR0/a
 l $LOWER_DIR0/d
 
 f $LOWER_DIR0/b
-l $LOWER_DIR1/d5/e
+d $LOWER_DIR0/d5
+l $LOWER_DIR0/d5/e
 
-l $LOWER_DIR1/d1/d2/d3/d4/c
+d $LOWER_DIR0/d1/d2
+d $LOWER_DIR0/d1/d2/d3
+d $LOWER_DIR0/d1/d2/d3/d4
+l $LOWER_DIR0/d1/d2/d3/d4/c
+FILES
 
+if [ $ODF -eq 0 ]; then
+cat <<FILES
+w $LOWER_DIR1 d1/d2/d3/d4/c
 FILES
+fi
 }
 
-
-
 function afterfiles_ro {
 cat <<FILES
 
@@ -81,15 +87,6 @@ FILES
 fi
 }
 
-
-
-
-##### simple tests
-init_odf $LOWER_DIR0 $LOWER_DIR1
-( directories ; beforefiles) | create_hierarchy
-
-mount_union "" $LOWER_DIR0 $LOWER_DIR1
-
 function do_link {
        SOURCE=$1
        DEST=$2
@@ -104,22 +101,30 @@ function do_link {
        return 0
 }
 
-echo -n "[rw] "
+function test_rw {
+#read-write tests
+init_odf $LOWER_DIR0 $LOWER_DIR1
+( directories ; beforefiles) | create_hierarchy
+
+mount_union "" $LOWER_DIR0 $LOWER_DIR1
+
 do_link $MOUNTPOINT/a $MOUNTPOINT/d || exit $?
 do_link $MOUNTPOINT/b $MOUNTPOINT/d5/e || exit $?
 do_link $MOUNTPOINT/a $MOUNTPOINT/d1/d2/d3/d4/c || exit $?
 
 unmount_union
-( directories ; ( [ $ODF -eq 0 ] && afterfiles_rw ) || afterfiles_ro )  | check_hierarchy
+( directories ; afterfiles_rw ) | check_hierarchy
 discard_odf
+echo -n "[rw] "
+}
 
+function test_ro {
+#read-only tests
 init_odf $LOWER_DIR0 $LOWER_DIR1=ro
 ( directories ; beforefiles) | create_hierarchy
 
 mount_union "" $LOWER_DIR0 $LOWER_DIR1=ro
 
-echo -n "[ro] "
-
 ln --symbolic $MOUNTPOINT/a $MOUNTPOINT/d || exit $?
 ln --symbolic $MOUNTPOINT/b $MOUNTPOINT/d5/e || exit $?
 ln --symbolic $MOUNTPOINT/a $MOUNTPOINT/d1/d2/d3/d4/c || exit $?
@@ -127,5 +132,10 @@ ln --symbolic $MOUNTPOINT/a $MOUNTPOINT/d1/d2/d3/d4/c || exit $?
 unmount_union
 ( directories ; afterfiles_ro )  | check_hierarchy
 discard_odf
+echo -n "[ro] "
+}
+
+test_rw
+test_ro
 
 complete_test