From 26e8de5c385a5597d71b4aba4bb18dd1aa0ff604 Mon Sep 17 00:00:00 2001
From: Erez Zadok <ezk@cs.sunysb.edu>
Date: Wed, 21 Nov 2007 03:54:17 -0500
Subject: [PATCH] add new rmdir test

---
 brm.conf     |  1 +
 default.conf |  1 +
 t-rmdir.sh   | 98 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 thor.conf    |  1 +
 4 files changed, 101 insertions(+)
 create mode 100755 t-rmdir.sh

diff --git a/brm.conf b/brm.conf
index 45f0b79..2582e2c 100644
--- 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 ccbfd37..3289554 100644
--- 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
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 8362170..95959aa 100644
--- 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
-- 
2.43.0