From e01042b84abdfa224d47e6d11eb9798ce4c7d2f8 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@tavianator.com>
Date: Fri, 16 Dec 2022 14:17:07 -0500
Subject: tests: Replace skip_unless test with test || skip

---
 tests/bfs/L_capable.sh              |  6 +++---
 tests/bfs/capable.sh                |  6 +++---
 tests/bfs/exec_flush_fprint_fail.sh |  2 +-
 tests/bfs/fprint_error_stderr.sh    |  2 +-
 tests/bfs/fprint_error_stdout.sh    |  2 +-
 tests/bfs/stderr_fails_loudly.sh    |  2 +-
 tests/bfs/stderr_fails_silently.sh  |  2 +-
 tests/bsd/L_acl.sh                  |  4 ++--
 tests/bsd/L_xattr.sh                |  4 ++--
 tests/bsd/L_xattrname.sh            |  4 ++--
 tests/bsd/acl.sh                    |  4 ++--
 tests/bsd/flags.sh                  |  4 ++--
 tests/bsd/xattr.sh                  |  4 ++--
 tests/bsd/xattrname.sh              |  4 ++--
 tests/common/L_ilname.sh            |  2 +-
 tests/common/L_mount.sh             |  4 ++--
 tests/common/ilname.sh              |  2 +-
 tests/common/iname.sh               |  2 +-
 tests/common/inum_bind_mount.sh     |  4 ++--
 tests/common/inum_mount.sh          |  4 ++--
 tests/common/ipath.sh               |  2 +-
 tests/common/mount.sh               |  4 ++--
 tests/gnu/exec_flush_fail.sh        |  2 +-
 tests/gnu/exec_plus_flush_fail.sh   |  2 +-
 tests/gnu/fprint_error.sh           |  2 +-
 tests/gnu/fprint_noerror.sh         |  2 +-
 tests/gnu/fstype.sh                 |  3 +--
 tests/gnu/gid_plus.sh               |  2 +-
 tests/gnu/gid_plus_plus.sh          |  2 +-
 tests/gnu/inum_automount.sh         |  6 +++---
 tests/gnu/iwholename.sh             |  2 +-
 tests/gnu/print_error.sh            |  2 +-
 tests/gnu/regex_invalid_utf8.sh     |  6 +++---
 tests/gnu/regextype_emacs.sh        |  2 +-
 tests/gnu/regextype_grep.sh         |  2 +-
 tests/gnu/uid_plus.sh               |  2 +-
 tests/gnu/uid_plus_plus.sh          |  2 +-
 tests/gnu/xtype_bind_mount.sh       |  4 ++--
 tests/posix/L_xdev.sh               |  4 ++--
 tests/posix/name_bracket.sh         |  2 +-
 tests/posix/readdir_error.sh        |  4 ++--
 tests/posix/type_bind_mount.sh      |  4 ++--
 tests/posix/xdev.sh                 |  4 ++--
 tests/tests.sh                      | 10 ----------
 44 files changed, 67 insertions(+), 78 deletions(-)

(limited to 'tests')

diff --git a/tests/bfs/L_capable.sh b/tests/bfs/L_capable.sh
index 533ac2f..a349677 100644
--- a/tests/bfs/L_capable.sh
+++ b/tests/bfs/L_capable.sh
@@ -1,9 +1,9 @@
-skip_unless test "$SUDO"
-skip_unless test "$UNAME" = "Linux"
+test "$SUDO" || skip
+test "$UNAME" = "Linux" || skip
 
 clean_scratch
 
-skip_unless invoke_bfs scratch -quit -capable
+invoke_bfs scratch -quit -capable || skip
 
 "$XTOUCH" scratch/{normal,capable}
 sudo setcap all+ep scratch/capable
diff --git a/tests/bfs/capable.sh b/tests/bfs/capable.sh
index 256b9bc..8b60ea6 100644
--- a/tests/bfs/capable.sh
+++ b/tests/bfs/capable.sh
@@ -1,9 +1,9 @@
-skip_unless test "$SUDO"
-skip_unless test "$UNAME" = "Linux"
+test "$SUDO" || skip
+test "$UNAME" = "Linux" || skip
 
 clean_scratch
 
-skip_unless invoke_bfs scratch -quit -capable
+invoke_bfs scratch -quit -capable || skip
 
 "$XTOUCH" scratch/{normal,capable}
 sudo setcap all+ep scratch/capable
diff --git a/tests/bfs/exec_flush_fprint_fail.sh b/tests/bfs/exec_flush_fprint_fail.sh
index 5da944a..b58624a 100644
--- a/tests/bfs/exec_flush_fprint_fail.sh
+++ b/tests/bfs/exec_flush_fprint_fail.sh
@@ -1,2 +1,2 @@
-skip_unless test -e /dev/full
+test -e /dev/full || skip
 fail invoke_bfs basic/a -fprint /dev/full -exec true \;
diff --git a/tests/bfs/fprint_error_stderr.sh b/tests/bfs/fprint_error_stderr.sh
index 427808f..e51d026 100644
--- a/tests/bfs/fprint_error_stderr.sh
+++ b/tests/bfs/fprint_error_stderr.sh
@@ -1,2 +1,2 @@
-skip_unless test -e /dev/full
+test -e /dev/full || skip
 fail invoke_bfs basic -maxdepth 0 -fprint /dev/full 2>/dev/full
diff --git a/tests/bfs/fprint_error_stdout.sh b/tests/bfs/fprint_error_stdout.sh
index fbdc1d0..6aa4b11 100644
--- a/tests/bfs/fprint_error_stdout.sh
+++ b/tests/bfs/fprint_error_stdout.sh
@@ -1,2 +1,2 @@
-skip_unless test -e /dev/full
+test -e /dev/full || skip
 fail invoke_bfs basic -maxdepth 0 -fprint /dev/full >/dev/full
diff --git a/tests/bfs/stderr_fails_loudly.sh b/tests/bfs/stderr_fails_loudly.sh
index d8b3861..c423d9e 100644
--- a/tests/bfs/stderr_fails_loudly.sh
+++ b/tests/bfs/stderr_fails_loudly.sh
@@ -1,2 +1,2 @@
-skip_unless test -e /dev/full
+test -e /dev/full || skip
 fail invoke_bfs -D all basic -false -fprint /dev/full 2>/dev/full
diff --git a/tests/bfs/stderr_fails_silently.sh b/tests/bfs/stderr_fails_silently.sh
index 731cb02..a37393d 100644
--- a/tests/bfs/stderr_fails_silently.sh
+++ b/tests/bfs/stderr_fails_silently.sh
@@ -1,2 +1,2 @@
-skip_unless test -e /dev/full
+test -e /dev/full || skip
 bfs_diff -D all basic 2>/dev/full
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)
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}
diff --git a/tests/gnu/exec_flush_fail.sh b/tests/gnu/exec_flush_fail.sh
index 4772a14..ce796b2 100644
--- a/tests/gnu/exec_flush_fail.sh
+++ b/tests/gnu/exec_flush_fail.sh
@@ -1,3 +1,3 @@
 # Failure to flush streams before exec should be caught
-skip_unless test -e /dev/full
+test -e /dev/full || skip
 fail invoke_bfs basic -print0 -exec true \; >/dev/full
diff --git a/tests/gnu/exec_plus_flush_fail.sh b/tests/gnu/exec_plus_flush_fail.sh
index 5c74fd8..8beee09 100644
--- a/tests/gnu/exec_plus_flush_fail.sh
+++ b/tests/gnu/exec_plus_flush_fail.sh
@@ -1,2 +1,2 @@
-skip_unless test -e /dev/full
+test -e /dev/full || skip
 fail invoke_bfs basic/a -print0 -exec echo found {} + >/dev/full
diff --git a/tests/gnu/fprint_error.sh b/tests/gnu/fprint_error.sh
index e7f2394..0e75b0e 100644
--- a/tests/gnu/fprint_error.sh
+++ b/tests/gnu/fprint_error.sh
@@ -1,2 +1,2 @@
-skip_unless test -e /dev/full
+test -e /dev/full || skip
 fail invoke_bfs basic -maxdepth 0 -fprint /dev/full
diff --git a/tests/gnu/fprint_noerror.sh b/tests/gnu/fprint_noerror.sh
index 142e935..f13a62b 100644
--- a/tests/gnu/fprint_noerror.sh
+++ b/tests/gnu/fprint_noerror.sh
@@ -1,3 +1,3 @@
 # Regression test: /dev/full should not fail until actually written to
-skip_unless test -e /dev/full
+test -e /dev/full || skip
 invoke_bfs basic -false -fprint /dev/full
diff --git a/tests/gnu/fstype.sh b/tests/gnu/fstype.sh
index 939438e..05645c3 100644
--- a/tests/gnu/fstype.sh
+++ b/tests/gnu/fstype.sh
@@ -1,3 +1,2 @@
-fstype=$(invoke_bfs basic -maxdepth 0 -printf '%F\n')
-skip_if test $? -ne 0
+fstype=$(invoke_bfs basic -maxdepth 0 -printf '%F\n') || skip
 bfs_diff basic -fstype "$fstype"
diff --git a/tests/gnu/gid_plus.sh b/tests/gnu/gid_plus.sh
index 8ad493b..ccba0e6 100644
--- a/tests/gnu/gid_plus.sh
+++ b/tests/gnu/gid_plus.sh
@@ -1,2 +1,2 @@
-skip_if test "$(id -g)" -eq 0
+test "$(id -g)" -eq 0 && skip
 bfs_diff basic -gid +0
diff --git a/tests/gnu/gid_plus_plus.sh b/tests/gnu/gid_plus_plus.sh
index 7982633..ec7ae86 100644
--- a/tests/gnu/gid_plus_plus.sh
+++ b/tests/gnu/gid_plus_plus.sh
@@ -1,2 +1,2 @@
-skip_if test "$(id -g)" -eq 0
+test "$(id -g)" -eq 0 && skip
 bfs_diff basic -gid ++0
diff --git a/tests/gnu/inum_automount.sh b/tests/gnu/inum_automount.sh
index 648ea05..6bf2977 100644
--- a/tests/gnu/inum_automount.sh
+++ b/tests/gnu/inum_automount.sh
@@ -1,11 +1,11 @@
 # bfs shouldn't trigger automounts unless it descends into them
 
-skip_unless test "$SUDO"
-skip_unless command -v systemd-mount &>/dev/null
+test "$SUDO" || skip
+command -v systemd-mount &>/dev/null || skip
 
 clean_scratch
 mkdir scratch/{foo,automnt}
-skip_unless sudo systemd-mount -A -o bind basic scratch/automnt
+sudo systemd-mount -A -o bind basic scratch/automnt || skip
 
 before=$(inum scratch/automnt)
 bfs_diff scratch -inum "$before" -prune
diff --git a/tests/gnu/iwholename.sh b/tests/gnu/iwholename.sh
index 67e9630..0b2d038 100644
--- a/tests/gnu/iwholename.sh
+++ b/tests/gnu/iwholename.sh
@@ -1,2 +1,2 @@
-skip_unless invoke_bfs -quit -iwholename PATTERN
+invoke_bfs -quit -iwholename PATTERN || skip
 bfs_diff basic -iwholename 'basic/*F*'
diff --git a/tests/gnu/print_error.sh b/tests/gnu/print_error.sh
index 9fd5af5..62a32b4 100644
--- a/tests/gnu/print_error.sh
+++ b/tests/gnu/print_error.sh
@@ -1,2 +1,2 @@
-skip_unless test -e /dev/full
+test -e /dev/full || skip
 fail invoke_bfs basic -maxdepth 0 >/dev/full
diff --git a/tests/gnu/regex_invalid_utf8.sh b/tests/gnu/regex_invalid_utf8.sh
index edb4b1e..603d688 100644
--- a/tests/gnu/regex_invalid_utf8.sh
+++ b/tests/gnu/regex_invalid_utf8.sh
@@ -1,8 +1,8 @@
 clean_scratch
 
 # Incomplete UTF-8 sequences
-skip_unless touch scratch/$'\xC3'
-skip_unless touch scratch/$'\xE2\x84'
-skip_unless touch scratch/$'\xF0\x9F\x92'
+touch scratch/$'\xC3' || skip
+touch scratch/$'\xE2\x84' || skip
+touch scratch/$'\xF0\x9F\x92' || skip
 
 bfs_diff scratch -regex 'scratch/..'
diff --git a/tests/gnu/regextype_emacs.sh b/tests/gnu/regextype_emacs.sh
index d0f68cc..3cc388c 100644
--- a/tests/gnu/regextype_emacs.sh
+++ b/tests/gnu/regextype_emacs.sh
@@ -1,3 +1,3 @@
-skip_unless invoke_bfs -regextype emacs -quit
+invoke_bfs -regextype emacs -quit || skip
 
 bfs_diff basic -regextype emacs -regex '.*/\(f+o?o?\|bar\)'
diff --git a/tests/gnu/regextype_grep.sh b/tests/gnu/regextype_grep.sh
index 0136700..0830667 100644
--- a/tests/gnu/regextype_grep.sh
+++ b/tests/gnu/regextype_grep.sh
@@ -1,3 +1,3 @@
-skip_unless invoke_bfs -regextype grep -quit
+invoke_bfs -regextype grep -quit || skip
 
 bfs_diff basic -regextype grep -regex '.*/f\+o\?o\?'
diff --git a/tests/gnu/uid_plus.sh b/tests/gnu/uid_plus.sh
index fc4bce3..22b2c8e 100644
--- a/tests/gnu/uid_plus.sh
+++ b/tests/gnu/uid_plus.sh
@@ -1,2 +1,2 @@
-skip_if test "$(id -u)" -eq 0
+test "$(id -u)" -eq 0 && skip
 bfs_diff basic -uid +0
diff --git a/tests/gnu/uid_plus_plus.sh b/tests/gnu/uid_plus_plus.sh
index 5d5e086..e021888 100644
--- a/tests/gnu/uid_plus_plus.sh
+++ b/tests/gnu/uid_plus_plus.sh
@@ -1,2 +1,2 @@
-skip_if test "$(id -u)" -eq 0
+test "$(id -u)" -eq 0 && skip
 bfs_diff basic -uid ++0
diff --git a/tests/gnu/xtype_bind_mount.sh b/tests/gnu/xtype_bind_mount.sh
index 264b6f8..a6dbed3 100644
--- a/tests/gnu/xtype_bind_mount.sh
+++ b/tests/gnu/xtype_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/{file,null}
diff --git a/tests/posix/L_xdev.sh b/tests/posix/L_xdev.sh
index ddbadd8..2fc99dd 100644
--- a/tests/posix/L_xdev.sh
+++ b/tests/posix/L_xdev.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/posix/name_bracket.sh b/tests/posix/name_bracket.sh
index 84a417f..80ca186 100644
--- a/tests/posix/name_bracket.sh
+++ b/tests/posix/name_bracket.sh
@@ -1,5 +1,5 @@
 # fnmatch() is broken on macOS
-skip_if test "$UNAME" = "Darwin"
+test "$UNAME" = "Darwin" && skip
 
 # An unclosed [ should be matched literally
 bfs_diff weirdnames -name '['
diff --git a/tests/posix/readdir_error.sh b/tests/posix/readdir_error.sh
index ce06723..483f543 100644
--- a/tests/posix/readdir_error.sh
+++ b/tests/posix/readdir_error.sh
@@ -1,4 +1,4 @@
-skip_unless test "$UNAME" = "Linux"
+test "$UNAME" = "Linux" || skip
 
 clean_scratch
 mkfifo scratch/{fever,pid,wait,running}
@@ -33,5 +33,5 @@ while [ "$state" != "Z" ]; do
 done
 
 # On Linux, open(/proc/$pid/net) will succeed but readdir() will fail
-skip_unless test -r "/proc/$pid/net"
+test -r "/proc/$pid/net" || skip
 fail invoke_bfs "/proc/$pid/net" >/dev/null
diff --git a/tests/posix/type_bind_mount.sh b/tests/posix/type_bind_mount.sh
index 445f6ef..fe32875 100644
--- a/tests/posix/type_bind_mount.sh
+++ b/tests/posix/type_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/{file,null}
diff --git a/tests/posix/xdev.sh b/tests/posix/xdev.sh
index 4591940..44e04dd 100644
--- a/tests/posix/xdev.sh
+++ b/tests/posix/xdev.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/tests.sh b/tests/tests.sh
index 3fdf49b..3047bf4 100755
--- a/tests/tests.sh
+++ b/tests/tests.sh
@@ -543,16 +543,6 @@ function skip() {
     exit $EX_SKIP
 }
 
-function skip_if() {
-    if "$@"; then
-        skip
-    fi
-}
-
-function skip_unless() {
-    skip_if fail "$@"
-}
-
 function closefrom() {
     if [ -d /proc/self/fd ]; then
         local fds=/proc/self/fd
-- 
cgit v1.2.3