summaryrefslogtreecommitdiffstats
path: root/tests/bsd
diff options
context:
space:
mode:
authorTavian Barnes <tavianator@tavianator.com>2022-12-16 14:17:07 -0500
committerTavian Barnes <tavianator@tavianator.com>2022-12-16 14:17:07 -0500
commite01042b84abdfa224d47e6d11eb9798ce4c7d2f8 (patch)
treef55d5e3adfa5a5fb23119d9b149c76c289c12a0d /tests/bsd
parent681f14f7cdff2d8fae235b8fd09745cfcb93e666 (diff)
downloadbfs-e01042b84abdfa224d47e6d11eb9798ce4c7d2f8.tar.xz
tests: Replace skip_unless test with test || skip
Diffstat (limited to 'tests/bsd')
-rw-r--r--tests/bsd/L_acl.sh4
-rw-r--r--tests/bsd/L_xattr.sh4
-rw-r--r--tests/bsd/L_xattrname.sh4
-rw-r--r--tests/bsd/acl.sh4
-rw-r--r--tests/bsd/flags.sh4
-rw-r--r--tests/bsd/xattr.sh4
-rw-r--r--tests/bsd/xattrname.sh4
7 files changed, 14 insertions, 14 deletions
diff --git a/tests/bsd/L_acl.sh b/tests/bsd/L_acl.sh
index cf573e4..db97013 100644
--- a/tests/bsd/L_acl.sh
+++ b/tests/bsd/L_acl.sh
@@ -1,9 +1,9 @@
clean_scratch
-skip_unless invoke_bfs scratch -quit -acl
+invoke_bfs scratch -quit -acl || skip
"$XTOUCH" scratch/{normal,acl}
-skip_unless set_acl scratch/acl
+set_acl scratch/acl || skip
ln -s acl scratch/link
bfs_diff -L scratch -acl
diff --git a/tests/bsd/L_xattr.sh b/tests/bsd/L_xattr.sh
index 7c27e0d..1f61c78 100644
--- a/tests/bsd/L_xattr.sh
+++ b/tests/bsd/L_xattr.sh
@@ -1,3 +1,3 @@
-skip_unless invoke_bfs scratch -quit -xattr
-skip_unless make_xattrs
+invoke_bfs scratch -quit -xattr || skip
+make_xattrs || skip
bfs_diff -L scratch -xattr
diff --git a/tests/bsd/L_xattrname.sh b/tests/bsd/L_xattrname.sh
index 39d6a77..3b2006b 100644
--- a/tests/bsd/L_xattrname.sh
+++ b/tests/bsd/L_xattrname.sh
@@ -1,5 +1,5 @@
-skip_unless invoke_bfs scratch -quit -xattr
-skip_unless make_xattrs
+invoke_bfs scratch -quit -xattr || skip
+make_xattrs || skip
case "$UNAME" in
Darwin|FreeBSD)
diff --git a/tests/bsd/acl.sh b/tests/bsd/acl.sh
index 1665684..c044398 100644
--- a/tests/bsd/acl.sh
+++ b/tests/bsd/acl.sh
@@ -1,9 +1,9 @@
clean_scratch
-skip_unless invoke_bfs scratch -quit -acl
+invoke_bfs scratch -quit -acl || skip
"$XTOUCH" scratch/{normal,acl}
-skip_unless set_acl scratch/acl
+set_acl scratch/acl || skip
ln -s acl scratch/link
bfs_diff scratch -acl
diff --git a/tests/bsd/flags.sh b/tests/bsd/flags.sh
index ffb1cc2..949a7d3 100644
--- a/tests/bsd/flags.sh
+++ b/tests/bsd/flags.sh
@@ -1,8 +1,8 @@
-skip_unless invoke_bfs scratch -quit -flags offline
+invoke_bfs scratch -quit -flags offline || skip
clean_scratch
"$XTOUCH" scratch/{foo,bar}
-skip_unless chflags offline scratch/bar
+chflags offline scratch/bar || skip
bfs_diff scratch -flags -offline,nohidden
diff --git a/tests/bsd/xattr.sh b/tests/bsd/xattr.sh
index 727c220..4a4658c 100644
--- a/tests/bsd/xattr.sh
+++ b/tests/bsd/xattr.sh
@@ -1,3 +1,3 @@
-skip_unless invoke_bfs scratch -quit -xattr
-skip_unless make_xattrs
+invoke_bfs scratch -quit -xattr || skip
+make_xattrs || skip
bfs_diff scratch -xattr
diff --git a/tests/bsd/xattrname.sh b/tests/bsd/xattrname.sh
index 6a0fe7e..655bd74 100644
--- a/tests/bsd/xattrname.sh
+++ b/tests/bsd/xattrname.sh
@@ -1,5 +1,5 @@
-skip_unless invoke_bfs scratch -quit -xattr
-skip_unless make_xattrs
+invoke_bfs scratch -quit -xattr || skip
+make_xattrs || skip
case "$UNAME" in
Darwin|FreeBSD)