From a2af2746c4686201e2e0796fbdfa115d08727b86 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Sun, 22 Oct 2023 16:41:41 -0400
Subject: tests: Use test-specific scratch directories

---
 tests/bsd/type_w.sh | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

(limited to 'tests/bsd/type_w.sh')

diff --git a/tests/bsd/type_w.sh b/tests/bsd/type_w.sh
index 15b4e68..aec9cb1 100644
--- a/tests/bsd/type_w.sh
+++ b/tests/bsd/type_w.sh
@@ -2,51 +2,51 @@
 command -v mdconfig &>/dev/null || skip
 command -v newfs &>/dev/null || skip
 
-clean_scratch
+cd "$TEST"
 
 # Create a ramdisk
-truncate -s1M scratch/img
-md=$(bfs_sudo mdconfig scratch/img) || skip
+truncate -s1M img
+md=$(bfs_sudo mdconfig img) || skip
 defer bfs_sudo mdconfig -du "$md"
 
 # Make an ffs filesystem
 bfs_sudo newfs -n "/dev/$md" >&2 || skip
-mkdir scratch/mnt
+mkdir mnt
 
 # Mount it
-bfs_sudo mount "/dev/$md" scratch/mnt || skip
-defer bfs_sudo umount scratch/mnt
+bfs_sudo mount "/dev/$md" mnt || skip
+defer bfs_sudo umount mnt
 
 # Make it owned by us
-bfs_sudo chown "$(id -u):$(id -g)" scratch/mnt
-"$XTOUCH" -p scratch/mnt/{lower/{foo,bar,baz},upper/{bar,baz/qux}}
+bfs_sudo chown "$(id -u):$(id -g)" mnt
+"$XTOUCH" -p mnt/{lower/{foo,bar,baz},upper/{bar,baz/qux}}
 
 # Mount a union filesystem within it
-bfs_sudo mount -t unionfs -o below scratch/mnt/{lower,upper}
-defer bfs_sudo umount scratch/mnt/upper
+bfs_sudo mount -t unionfs -o below mnt/{lower,upper}
+defer bfs_sudo umount mnt/upper
 
 # Create a whiteout
-rm scratch/mnt/upper/bar
+rm mnt/upper/bar
 
 # FreeBSD find doesn't have -printf, so munge -ls output
 munge_ls() {
-    sed -En 's|.*([-drwx]{10}).*(scratch/.*)|'"$1"': \1 \2|p'
+    sed -En 's|.*([-drwx]{10}).*(mnt/.*)|'"$1"': \1 \2|p'
 }
 
 # Do a few tests in one
 {
     # Normally, we shouldn't see the whiteouts
-    invoke_bfs scratch/mnt -ls | munge_ls 1
+    invoke_bfs mnt -ls | munge_ls 1
     # -type w adds whiteouts to the output
-    invoke_bfs scratch/mnt -type w -ls | munge_ls 2
+    invoke_bfs mnt -type w -ls | munge_ls 2
     # So this is not the same as test 1
-    invoke_bfs scratch/mnt \( -type w -or -not -type w \) -ls | munge_ls 3
+    invoke_bfs mnt \( -type w -or -not -type w \) -ls | munge_ls 3
     # Unmount the unionfs
     pop_defer
     # Now repeat the same tests
-    invoke_bfs scratch/mnt -ls | munge_ls 4
-    invoke_bfs scratch/mnt -type w -ls | munge_ls 5
-    invoke_bfs scratch/mnt \( -type w -or -not -type w \) -ls | munge_ls 6
+    invoke_bfs mnt -ls | munge_ls 4
+    invoke_bfs mnt -type w -ls | munge_ls 5
+    invoke_bfs mnt \( -type w -or -not -type w \) -ls | munge_ls 6
 } >"$OUT"
 sort_output
 diff_output
-- 
cgit v1.2.3