From 3ac3bee7b0d9c9be693415206efa664bf4a7d4a7 Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Tue, 17 Oct 2023 11:35:41 -0400 Subject: dir: Fix FreeBSD union mounts --- tests/posix/overlayfs.out | 5 +++++ tests/posix/overlayfs.sh | 7 +++++++ tests/posix/unionfs.out | 10 ++++++++++ tests/posix/unionfs.sh | 6 ++++++ 4 files changed, 28 insertions(+) create mode 100644 tests/posix/overlayfs.out create mode 100644 tests/posix/overlayfs.sh create mode 100644 tests/posix/unionfs.out create mode 100644 tests/posix/unionfs.sh (limited to 'tests') diff --git a/tests/posix/overlayfs.out b/tests/posix/overlayfs.out new file mode 100644 index 0000000..754d01d --- /dev/null +++ b/tests/posix/overlayfs.out @@ -0,0 +1,5 @@ +scratch/merged +scratch/merged/bar +scratch/merged/baz +scratch/merged/baz/qux +scratch/merged/foo diff --git a/tests/posix/overlayfs.sh b/tests/posix/overlayfs.sh new file mode 100644 index 0000000..a56b5b3 --- /dev/null +++ b/tests/posix/overlayfs.sh @@ -0,0 +1,7 @@ +test "$UNAME" = "Linux" || skip +clean_scratch +"$XTOUCH" -p scratch/{lower/{foo,bar,baz},upper/{bar,baz/qux}} +mkdir -p scratch/{work,merged} +bfs_sudo mount -t overlay overlay -olowerdir=scratch/lower,upperdir=scratch/upper,workdir=scratch/work scratch/merged || skip +trap "bfs_sudo umount scratch/merged; bfs_sudo rm -rf scratch/work" EXIT +bfs_diff scratch/merged diff --git a/tests/posix/unionfs.out b/tests/posix/unionfs.out new file mode 100644 index 0000000..6d0fa3c --- /dev/null +++ b/tests/posix/unionfs.out @@ -0,0 +1,10 @@ +scratch +scratch/lower +scratch/lower/bar +scratch/lower/baz +scratch/lower/foo +scratch/upper +scratch/upper/bar +scratch/upper/baz +scratch/upper/baz/qux +scratch/upper/foo diff --git a/tests/posix/unionfs.sh b/tests/posix/unionfs.sh new file mode 100644 index 0000000..88a549f --- /dev/null +++ b/tests/posix/unionfs.sh @@ -0,0 +1,6 @@ +[[ "$UNAME" == *BSD* ]] || skip +clean_scratch +"$XTOUCH" -p scratch/{lower/{foo,bar,baz},upper/{bar,baz/qux}} +bfs_sudo mount -t unionfs -o below scratch/{lower,upper} || skip +trap "bfs_sudo umount scratch/upper" EXIT +bfs_diff scratch -- cgit v1.2.3