t-create.sh: update create test for new unionfs_create semantics.

run-tests: work around race bug in block2mtd.

*.conf (DELAY): reduce default delay to 0.1 seconds.

diff --git a/brm.conf b/brm.conf
index 720d120e8575e00747f22ce5e4c1b6bcb2727640..b3e36bad3338bb5bd7bd1befa42653acf0ab5f71 100644 (file)
--- a/brm.conf
+++ b/brm.conf
@@ -73,7 +73,7 @@ case ${MYFS} in
 esac
 
 # delay between each test (in seconds, optional)
-DELAY=1
+DELAY=0.1
 
 # Echo the command being executed to a file/device (optional) This is useful
 # when unionfs printk's some debugging output which may go to a log file,

diff --git a/default.conf b/default.conf
index 2a73848f7e2f9f25f299f456081f17a652c776d9..50f1c9757a86f5cd24268c1ca9efe99b68929fc5 100644 (file)
--- a/default.conf
+++ b/default.conf
@@ -75,7 +75,7 @@ case ${MYFS} in
 esac
 
 # delay between each test (in seconds or fractions thereof, optional)
-DELAY=0.5
+DELAY=0.1
 
 # Echo the command being executed to a file/device (optional) This is useful
 # when unionfs printk's some debugging output which may go to a log file,

diff --git a/run-tests b/run-tests
index 448bd1b55e6f5299bc1bf6283b9737a6bd2ebbb2..8a834400125ae500e9b1cc0c9cf88abc02f799c3 100755 (executable)
--- a/run-tests
+++ b/run-tests
@@ -118,6 +118,7 @@ function setup_lower
            jffs2 )
                runcmd modprobe mtdblock
                runcmd modprobe block2mtd block2mtd=$dev,128ki
+               runcmd sync     # work around race bug in block2mtd
                runcmd mount -t $fs /dev/mtdblock$i /n/lower/b$i
                ;;
            reiserfs )

diff --git a/t-create.sh b/t-create.sh
old mode 100755 (executable)
new mode 100644 (file)
index f28e743..2581b38
--- a/t-create.sh
+++ b/t-create.sh
@@ -70,10 +70,12 @@ FILES
 function afterfiles_rw {
 cat <<FILES
 f $LOWER_DIR0/y
-
 f $LOWER_DIR0/d1/x
+d $LOWER_DIR0/d1/d2/d3
+d $LOWER_DIR0/d1/d2/d3/d4
+f $LOWER_DIR0/d1/d2/d3/d4/d
 
-f $LOWER_DIR2/d1/d2/d3/d4/d
+f $LOWER_DIR2/d1/d2/d3/d4/.wh.d
 
 FILES
 }

diff --git a/thor.conf b/thor.conf
index af52ba07141f4b92b76ac0f5816dd7b7b5918e72..258a94817356a739ccc064dc82a462c9398d63f2 100644 (file)
--- a/thor.conf
+++ b/thor.conf
@@ -74,7 +74,7 @@ case ${MYFS} in
 esac
 
 # delay between each test (in seconds, optional)
-DELAY=0.125
+DELAY=0.1
 
 # Echo the command being executed to a file/device (optional) This is useful
 # when unionfs printk's some debugging output which may go to a log file,