new semantics: new symlinks get created in first branch always

Signed-off-by: Erez Zadok <ezk@cs.sunysb.edu>

diff --git a/t-symlink.sh b/t-symlink.sh
index cf1716e2fb10602f64d5deba4ca2aae2a263ff03..8d1a1d419237240bf40d6dd1e44371152312a436 100755 (executable)
--- a/t-symlink.sh
+++ b/t-symlink.sh
@@ -47,11 +47,15 @@ function afterfiles_rw {
 cat <<FILES
 f $LOWER_DIR0/a
 l $LOWER_DIR0/d
-
+d $LOWER_DIR0/d1/d2
+d $LOWER_DIR0/d1/d2/d3
+d $LOWER_DIR0/d1/d2/d3/d4
 f $LOWER_DIR0/b
-l $LOWER_DIR1/d5/e
+d $LOWER_DIR0/d5
+l $LOWER_DIR0/d5/e
+l $LOWER_DIR0/d1/d2/d3/d4/c
 
-l $LOWER_DIR1/d1/d2/d3/d4/c
+f $LOWER_DIR1/d1/d2/d3/d4/.wh.c
 
 FILES
 }
@@ -78,13 +82,6 @@ FILES
 }
 
 
-
-
-##### simple tests
-( directories ; beforefiles) | create_hierarchy
-
-mount_union "" $LOWER_DIR0 $LOWER_DIR1
-
 function do_link {
        SOURCE=$1
        DEST=$2
@@ -99,26 +96,38 @@ function do_link {
        return 0
 }
 
-echo -n "[rw] "
+
+function test_rw {
+# rw tests
+( 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 ; afterfiles_rw )  | check_hierarchy $TOP_LOWER_DIR
+echo -n "[rw] "
+}
 
+function test_ro {
+# read-only tests
 ( 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 $?
 
 unmount_union
 ( directories ; afterfiles_ro )  | check_hierarchy $TOP_LOWER_DIR
+echo -n "[ro] "
+}
 
+test_rw
+test_ro
 
 complete_test