From 55a1ad42bd172aa235015b88c092a225ec7f4862 Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Thu, 20 Oct 2022 13:21:41 -0400 Subject: tests: Add a helper for cleaning scratch And try to unmount things if the a test left them mounted. --- tests/bsd/L_acl.sh | 2 +- tests/bsd/acl.sh | 2 +- tests/bsd/flags.sh | 2 +- tests/bsd/rm.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/bsd') diff --git a/tests/bsd/L_acl.sh b/tests/bsd/L_acl.sh index d8f5a7d..4f990bb 100644 --- a/tests/bsd/L_acl.sh +++ b/tests/bsd/L_acl.sh @@ -1,4 +1,4 @@ -rm -rf scratch/* +clean_scratch skip_unless invoke_bfs scratch -quit -acl diff --git a/tests/bsd/acl.sh b/tests/bsd/acl.sh index 5bbfccc..c669005 100644 --- a/tests/bsd/acl.sh +++ b/tests/bsd/acl.sh @@ -1,4 +1,4 @@ -rm -rf scratch/* +clean_scratch skip_unless invoke_bfs scratch -quit -acl diff --git a/tests/bsd/flags.sh b/tests/bsd/flags.sh index 99d0fdb..fd25150 100644 --- a/tests/bsd/flags.sh +++ b/tests/bsd/flags.sh @@ -1,6 +1,6 @@ skip_unless invoke_bfs scratch -quit -flags offline -rm -rf scratch/* +clean_scratch $TOUCH scratch/{foo,bar} skip_unless chflags offline scratch/bar diff --git a/tests/bsd/rm.sh b/tests/bsd/rm.sh index 2e8b613..e661a37 100644 --- a/tests/bsd/rm.sh +++ b/tests/bsd/rm.sh @@ -1,4 +1,4 @@ -rm -rf scratch/* +clean_scratch touchp scratch/foo/bar/baz (cd scratch && invoke_bfs . -rm) -- cgit v1.2.3