add new rmdir test

diff --git a/brm.conf b/brm.conf
index 45f0b79d9991e29376075cda1a98204458b4a916..2582e2c3250f7337daf2424f808855c04a7c8750 100644 (file)
--- a/brm.conf
+++ b/brm.conf
@@ -20,6 +20,7 @@ ALL_TESTS="
        t-readdir.sh
        t-rename-matrix.sh
        t-rename-whiteout.sh
+       t-rmdir.sh
        t-symlink.sh
        t-truncate-all.sh
        t-unlink-whiteout.sh

diff --git a/default.conf b/default.conf
index ccbfd37761834d915c4f98c9bcc65dc05a2a4373..3289554b15b1138409b4d1c7f3ddb7f9bffc766a 100644 (file)
--- a/default.conf
+++ b/default.conf
@@ -22,6 +22,7 @@ ALL_TESTS="
        t-readdir.sh
        t-rename-matrix.sh
        t-rename-whiteout.sh
+       t-rmdir.sh
        t-symlink.sh
        t-truncate-all.sh
        t-unlink-whiteout.sh

diff --git a/t-rmdir.sh b/t-rmdir.sh
new file mode 100755 (executable)
index 0000000..93a6b58
--- /dev/null
+++ b/t-rmdir.sh
@@ -0,0 +1,98 @@
+#!/bin/sh
+
+source scaffold
+
+# initial directories
+function directories {
+cat <<FILES
+d $TOP_LOWER_DIR
+d $LOWER_DIR0
+d $LOWER_DIR0/d6
+d $LOWER_DIR1
+d $LOWER_DIR1/d5
+d $LOWER_DIR1/d1
+d $LOWER_DIR1/d1/d2
+d $LOWER_DIR1/d1/d2/d3
+f $LOWER_DIR1/d1/d2/d3/a
+f $LOWER_DIR1/d1/d2/d3/b
+f $LOWER_DIR1/d1/d2/d3/c
+d $LOWER_DIR1/d1/d2/d3/d4
+d $LOWER_DIR2
+d $LOWER_DIR2/d5
+d $LOWER_DIR2/d1
+d $LOWER_DIR2/d1/d2
+d $LOWER_DIR2/d1/d2/d3
+f $LOWER_DIR2/d1/d2/d3/d
+f $LOWER_DIR2/d1/d2/d3/e
+f $LOWER_DIR2/d1/d2/d3/f
+d $LOWER_DIR2/d1/d2/d3/d4
+d $LOWER_DIR3
+
+FILES
+}
+
+# initial set of files
+function beforefiles {
+cat <<FILES
+d $LOWER_DIR0/d1
+d $LOWER_DIR0/d1/d2
+f $LOWER_DIR0/d1/.wh.x
+f $LOWER_DIR0/d1/d2/.wh.d3
+
+FILES
+}
+
+
+function afterfiles_rw {
+cat <<FILES
+
+f $LOWER_DIR0/.wh.d1
+f $LOWER_DIR0/.wh.y
+
+FILES
+}
+
+
+
+function afterfiles_ro {
+cat <<FILES
+
+f $LOWER_DIR0/.wh.d1
+f $LOWER_DIR0/.wh.y
+
+FILES
+}
+
+
+##### simple tests
+( directories ; beforefiles) | create_hierarchy
+
+mount_union "" $LOWER_DIR0 $LOWER_DIR1 $LOWER_DIR2
+
+mkdir $MOUNTPOINT/y
+mkdir $MOUNTPOINT/d1/x
+mkdir $MOUNTPOINT/d1/d2/d3
+rm -fr $MOUNTPOINT/d1
+rm -fr $MOUNTPOINT/y
+
+unmount_union
+( directories ; afterfiles_rw )  | check_hierarchy $TOP_LOWER_DIR
+echo -n "[rw] "
+
+
+#### simple tests
+( directories ; beforefiles) | create_hierarchy
+
+mount_union "" $LOWER_DIR0 $LOWER_DIR1=ro $LOWER_DIR2=ro
+
+mkdir $MOUNTPOINT/y
+mkdir $MOUNTPOINT/d1/x
+mkdir $MOUNTPOINT/d1/d2/d3
+rm -fr $MOUNTPOINT/d1
+rm -fr $MOUNTPOINT/y
+
+unmount_union
+( directories ; afterfiles_ro )  | check_hierarchy $TOP_LOWER_DIR
+echo -n "[ro] "
+
+complete_test

diff --git a/thor.conf b/thor.conf
index 83621701fbcf00d1ae39a6cf086357820da92c28..95959aa69f08dd259419ca5907b9686e5c6d6d8c 100644 (file)
--- a/thor.conf
+++ b/thor.conf
@@ -21,6 +21,7 @@ ALL_TESTS="
        t-readdir.sh
        t-rename-matrix.sh
        t-rename-whiteout.sh
+       t-rmdir.sh
        t-symlink.sh
        t-truncate-all.sh
        t-unlink-whiteout.sh