summaryrefslogtreecommitdiffstats
path: root/tests/common
diff options
context:
space:
mode:
Diffstat (limited to 'tests/common')
-rw-r--r--tests/common/L_mount.sh2
-rw-r--r--tests/common/inum_bind_mount.sh2
-rw-r--r--tests/common/inum_mount.sh2
-rw-r--r--tests/common/mount.sh2
4 files changed, 4 insertions, 4 deletions
diff --git a/tests/common/L_mount.sh b/tests/common/L_mount.sh
index b04acd0..aaf9069 100644
--- a/tests/common/L_mount.sh
+++ b/tests/common/L_mount.sh
@@ -4,7 +4,7 @@ clean_scratch
mkdir scratch/{foo,mnt}
bfs_sudo mount -t tmpfs tmpfs scratch/mnt || skip
-trap "bfs_sudo umount scratch/mnt" EXIT
+defer bfs_sudo umount scratch/mnt
ln -s ../mnt scratch/foo/bar
"$XTOUCH" scratch/mnt/baz
diff --git a/tests/common/inum_bind_mount.sh b/tests/common/inum_bind_mount.sh
index ecb4ec3..47f7c36 100644
--- a/tests/common/inum_bind_mount.sh
+++ b/tests/common/inum_bind_mount.sh
@@ -4,6 +4,6 @@ clean_scratch
"$XTOUCH" scratch/{foo,bar}
bfs_sudo mount --bind scratch/{foo,bar} || skip
-trap "bfs_sudo umount scratch/bar" EXIT
+defer bfs_sudo umount scratch/bar
bfs_diff scratch -inum "$(inum scratch/bar)"
diff --git a/tests/common/inum_mount.sh b/tests/common/inum_mount.sh
index a4832e4..1bf2d86 100644
--- a/tests/common/inum_mount.sh
+++ b/tests/common/inum_mount.sh
@@ -4,6 +4,6 @@ clean_scratch
mkdir scratch/{foo,mnt}
bfs_sudo mount -t tmpfs tmpfs scratch/mnt || skip
-trap "bfs_sudo umount scratch/mnt" EXIT
+defer bfs_sudo umount scratch/mnt
bfs_diff scratch -inum "$(inum scratch/mnt)"
diff --git a/tests/common/mount.sh b/tests/common/mount.sh
index b13b43c..db8b801 100644
--- a/tests/common/mount.sh
+++ b/tests/common/mount.sh
@@ -4,7 +4,7 @@ clean_scratch
mkdir scratch/{foo,mnt}
bfs_sudo mount -t tmpfs tmpfs scratch/mnt || skip
-trap "bfs_sudo umount scratch/mnt" EXIT
+defer bfs_sudo umount scratch/mnt
"$XTOUCH" scratch/foo/bar scratch/mnt/baz