Restructured tests so mandatory delay between source and target

directories can be inserted, to ensure mtime is not equal
now dir_add_remove fails because the mtime of the directory
changed after a file in it was altered

1 files changed, 19 insertions, 10 deletions

diff --git a/tests/05_symlink_add_remove.sh b/tests/05_symlink_add_remove.sh
index 0c8b0ac..badf199 100755
--- a/tests/05_symlink_add_remove.sh
+++ b/tests/05_symlink_add_remove.sh
@@ -11,16 +11,21 @@ TEST_TOOLS=$3
 
 ############# Test specific code ############
 
-setup () {
-	ln -s /foo $ORIGIN/remove &&
-	ln -s /bar $TARGET/add &&
-	chown -h :cdrom $TARGET/add &&
-	for dir in $ORIGIN $TARGET; do
+setup_origin () {
 	(
-		cd $dir && mkdir -p data &&
-		touch data/a data/b
-	); done &&
-	(cd $ORIGIN && ln -s data datalink)
+		cd $ORIGIN
+		ln -s /foo remove &&
+		mkdir -p data &&
+		touch data/a data/b && 
+		ln -s data datalink
+	)
+}
+
+setup_target () {
+	mkdir -p $TARGET/data &&
+	touch $TARGET/data/a $TARGET/data/b &&
+	ln -s /bar $TARGET/add &&
+	chown -h :cdrom $TARGET/add
 }
 
 check_results () {
@@ -30,9 +35,13 @@ check_results () {
 	check_same_mtime  $ORIGIN/add $TARGET/add &&
 	check_same_uidgid $ORIGIN/add $TARGET/add &&
 	test ! -L $ORIGIN/datalink &&
+	echo datalink not link &&
 	test   -d $ORIGIN/data &&
+	echo data is dir &&
 	test   -f $ORIGIN/data/a &&
-	test   -f $ORIGIN/data/b
+	echo a is dir &&
+	test   -f $ORIGIN/data/b &&
+	echo b is dir
 }
 
 #############################################