4 files changed, 9 insertions, 22 deletions
diff --git a/tests/cp/acl b/tests/cp/acl
index 42f7c3464..fd6e86dd0 100755
--- a/tests/cp/acl
+++ b/tests/cp/acl
@@ -21,11 +21,8 @@
 . $srcdir/../lang-default
 
 # Skip this test if cp was built without ACL support:
-grep '^#define USE_ACL 0' $CONFIG_HEADER > /dev/null && \
-  {
-    echo 1>&2 "$0: insufficient ACL support, so skipping this test"
-    (exit 77); exit 77
-  }
+grep '^#define USE_ACL 0' $CONFIG_HEADER > /dev/null &&
+  skip_test_ "insufficient ACL support"
 
 if test "$VERBOSE" = yes; then
   set -x
@@ -47,11 +44,7 @@ acl1=`cd a && getfacl file | grep -v ':bin:' | grep -v 'mask::'` \
   || skip=yes
 
 test $skip = yes &&
-  {
-    echo "$0: '.' is not on a suitable file system for this test" 1>&2
-    echo "$0: skipping this test" 1>&2
-    (exit 77); exit 77
-  }
+  skip_test_ "'.' is not on a suitable file system for this test"
 
 # copy a file without preserving permissions
 cp a/file b/ || fail=1
diff --git a/tests/cp/existing-perm-race b/tests/cp/existing-perm-race
index 11f38d261..0ab10e94d 100755
--- a/tests/cp/existing-perm-race
+++ b/tests/cp/existing-perm-race
@@ -31,10 +31,8 @@ g2=$2
 fail=0
 
 umask 077
-mkfifo fifo || {
-  echo "$0: fifos not supported; skipping this test." 1>&2
-  (exit 77); exit 77
-}
+mkfifo fifo ||
+  skip_test_ "fifos not supported"
 
 touch fifo-copy &&
 chgrp $g1 fifo &&
diff --git a/tests/cp/file-perm-race b/tests/cp/file-perm-race
index 94e402dbc..3e3859773 100755
--- a/tests/cp/file-perm-race
+++ b/tests/cp/file-perm-race
@@ -24,10 +24,8 @@ fi
 . $srcdir/../test-lib.sh
 
 umask 022
-mkfifo fifo || {
-  echo "$0: fifos not supported; skipping this test." 1>&2
-  (exit 77); exit 77
-}
+mkfifo fifo ||
+  skip_test_ "fifos not supported"
 
 # Copy a fifo's contents.  That way, we can examine the
 # destination permissions before they're finalized.
diff --git a/tests/cp/parent-perm-race b/tests/cp/parent-perm-race
index b09f8bced..8afa0c0b7 100755
--- a/tests/cp/parent-perm-race
+++ b/tests/cp/parent-perm-race
@@ -31,10 +31,8 @@ fail=0
 
 for attr in mode ownership
 do
-  mkfifo $attr/fifo || {
-    echo "$0: fifos not supported; skipping this test." 1>&2
-    (exit 77); exit 77
-  }
+  mkfifo $attr/fifo ||
+    skip_test_ "fifos not supported"
 
   # Copy a fifo's contents.  That way, we can examine d/$attr's
   # state while cp is running.