summaryrefslogtreecommitdiffstats
path: root/tests/common
diff options
context:
space:
mode:
Diffstat (limited to 'tests/common')
-rw-r--r--tests/common/L_ilname.sh2
-rw-r--r--tests/common/L_mount.sh4
-rw-r--r--tests/common/ilname.sh2
-rw-r--r--tests/common/iname.sh2
-rw-r--r--tests/common/inum_bind_mount.sh4
-rw-r--r--tests/common/inum_mount.sh4
-rw-r--r--tests/common/ipath.sh2
-rw-r--r--tests/common/mount.sh4
8 files changed, 12 insertions, 12 deletions
diff --git a/tests/common/L_ilname.sh b/tests/common/L_ilname.sh
index cfb15a8..e0495ed 100644
--- a/tests/common/L_ilname.sh
+++ b/tests/common/L_ilname.sh
@@ -1,2 +1,2 @@
-skip_unless invoke_bfs -quit -ilname PATTERN
+invoke_bfs -quit -ilname PATTERN || skip
bfs_diff -L links -ilname '[AQ]'
diff --git a/tests/common/L_mount.sh b/tests/common/L_mount.sh
index dad7e00..5b56762 100644
--- a/tests/common/L_mount.sh
+++ b/tests/common/L_mount.sh
@@ -1,5 +1,5 @@
-skip_unless test "$SUDO"
-skip_if test "$UNAME" = "Darwin"
+test "$SUDO" || skip
+test "$UNAME" = "Darwin" && skip
clean_scratch
mkdir scratch/{foo,mnt}
diff --git a/tests/common/ilname.sh b/tests/common/ilname.sh
index 7ab0793..fc7e9e4 100644
--- a/tests/common/ilname.sh
+++ b/tests/common/ilname.sh
@@ -1,2 +1,2 @@
-skip_unless invoke_bfs -quit -ilname PATTERN
+invoke_bfs -quit -ilname PATTERN || skip
bfs_diff links -ilname '[AQ]'
diff --git a/tests/common/iname.sh b/tests/common/iname.sh
index 8fcc443..c25a646 100644
--- a/tests/common/iname.sh
+++ b/tests/common/iname.sh
@@ -1,2 +1,2 @@
-skip_unless invoke_bfs -quit -iname PATTERN
+invoke_bfs -quit -iname PATTERN || skip
bfs_diff basic -iname '*F*'
diff --git a/tests/common/inum_bind_mount.sh b/tests/common/inum_bind_mount.sh
index e35ed4e..a9e01bf 100644
--- a/tests/common/inum_bind_mount.sh
+++ b/tests/common/inum_bind_mount.sh
@@ -1,5 +1,5 @@
-skip_unless test "$SUDO"
-skip_unless test "$UNAME" = "Linux"
+test "$SUDO" || skip
+test "$UNAME" = "Linux" || skip
clean_scratch
"$XTOUCH" scratch/{foo,bar}
diff --git a/tests/common/inum_mount.sh b/tests/common/inum_mount.sh
index f9f4e2b..7cc5e40 100644
--- a/tests/common/inum_mount.sh
+++ b/tests/common/inum_mount.sh
@@ -1,5 +1,5 @@
-skip_unless test "$SUDO"
-skip_if test "$UNAME" = "Darwin"
+test "$SUDO" || skip
+test "$UNAME" = "Darwin" && skip
clean_scratch
mkdir scratch/{foo,mnt}
diff --git a/tests/common/ipath.sh b/tests/common/ipath.sh
index 9e6f8c5..7d05f31 100644
--- a/tests/common/ipath.sh
+++ b/tests/common/ipath.sh
@@ -1,2 +1,2 @@
-skip_unless invoke_bfs -quit -ipath PATTERN
+invoke_bfs -quit -ipath PATTERN || skip
bfs_diff basic -ipath 'basic/*F*'
diff --git a/tests/common/mount.sh b/tests/common/mount.sh
index 2732a68..f077ea2 100644
--- a/tests/common/mount.sh
+++ b/tests/common/mount.sh
@@ -1,5 +1,5 @@
-skip_unless test "$SUDO"
-skip_if test "$UNAME" = "Darwin"
+test "$SUDO" || skip
+test "$UNAME" = "Darwin" && skip
clean_scratch
mkdir scratch/{foo,mnt}