tests: remove skip_test_ function; use new skip_ instead

* tests/init.cfg (skip_test_): Remove function.
Use skip_ in place of skip_test_ everywhere else.
* cfg.mk (sc_prohibit_skip_): Remove rule.
* tests/**: Use skip_, not skip_test_, everywhere.

6 files changed, 10 insertions, 10 deletions

diff --git a/tests/ls/capability b/tests/ls/capability
index 9cc8ba26d..c4762c963 100755
--- a/tests/ls/capability
+++ b/tests/ls/capability
@@ -21,10 +21,10 @@ print_ver_ ls
 require_root_
 
 grep '^#define HAVE_CAP 1' $CONFIG_HEADER > /dev/null \
-  || skip_test_ "configured without libcap support"
+  || skip_ "configured without libcap support"
 
 (setcap --help) 2>&1 |grep 'usage: setcap' > /dev/null \
-  || skip_test_ "setcap utility not found"
+  || skip_ "setcap utility not found"
 
 # Don't let a different umask perturb the results.
 umask 22
@@ -38,7 +38,7 @@ cd test
 touch cap_pos dir/cap_pos dir/cap_neg
 for file in cap_pos dir/cap_neg; do
   setcap 'cap_net_bind_service=ep' $file ||
-    skip_test_ "setcap doesn't work"
+    skip_ "setcap doesn't work"
 done
 
 code='30;41'
diff --git a/tests/ls/multihardlink b/tests/ls/multihardlink
index cf7db21e5..a9d31f4b7 100755
--- a/tests/ls/multihardlink
+++ b/tests/ls/multihardlink
@@ -21,7 +21,7 @@ print_ver_ ls
 working_umask_or_skip_
 
 touch file file1 || framework_failure
-ln file1 file2 || skip_test_ "can't create hard link"
+ln file1 file2 || skip_ "can't create hard link"
 code_mh='44;37'
 code_ex='01;32'
 code_png='01;35'
diff --git a/tests/ls/nameless-uid b/tests/ls/nameless-uid
index 7bd4f0ee3..a0de6ce92 100755
--- a/tests/ls/nameless-uid
+++ b/tests/ls/nameless-uid
@@ -29,7 +29,7 @@ nameless_uid=`$PERL -e '
 '`
 
 if test x$nameless_uid = x; then
-  skip_test_ "couldn't find a nameless UID"
+  skip_ "couldn't find a nameless UID"
 fi
 
 touch f || framework_failure
diff --git a/tests/ls/no-cap b/tests/ls/no-cap
index 193aea3fb..2cca71ca1 100755
--- a/tests/ls/no-cap
+++ b/tests/ls/no-cap
@@ -21,7 +21,7 @@ print_ver_ ls
 require_strace_ capget
 
 strace -e capget ls --color=always > /dev/null 2> out || fail=1
-$EGREP 'capget\(' out || skip_test_ "your ls doesn't call capget"
+$EGREP 'capget\(' out || skip_ "your ls doesn't call capget"
 
 rm -f out
 eval "$(TERM=xterm dircolors -b | sed 's/ca=[^:]*:/ca=:/')"
diff --git a/tests/ls/readdir-mountpoint-inode b/tests/ls/readdir-mountpoint-inode
index bd827acd5..83e67b0fc 100755
--- a/tests/ls/readdir-mountpoint-inode
+++ b/tests/ls/readdir-mountpoint-inode
@@ -23,7 +23,7 @@ print_ver_ ls
 # potentially very many remote mounts.
 mount_points=$(df --local -P 2>&1 | sed -n 's,.*[0-9]% \(/.\),\1,p')
 test -z "$mount_points" &&
-   skip_test_ "this test requires a non-root mount point"
+   skip_ "this test requires a non-root mount point"
 
 # Given e.g., /dev/shm, produce the list of GNU ls options that
 # let us list just that entry using readdir data from its parent:
@@ -50,8 +50,8 @@ inode_via_readdir()
   mount_point=$1
   base=$(basename $mount_point)
   case $base in
-    .*) skip_test_ 'mount point component starts with "."' ;;
-    *[*?]*) skip_test_ 'mount point component contains "?" or "*"' ;;
+    .*) skip_ 'mount point component starts with "."' ;;
+    *[*?]*) skip_ 'mount point component contains "?" or "*"' ;;
   esac
   opts=$(ls_ignore_options "$base")
   parent_dir=$(dirname $mount_point)
diff --git a/tests/ls/stat-dtype b/tests/ls/stat-dtype
index ddf8d2e43..dfa2dd555 100755
--- a/tests/ls/stat-dtype
+++ b/tests/ls/stat-dtype
@@ -30,7 +30,7 @@ print_ver_ ls
 mkdir -p c/d || framework_failure
 chmod a-x c || framework_failure
 if test "X`ls -p c 2>&1`" != Xd/; then
-  skip_test_ "'.' is not on a suitable file system for this test"
+  skip_ "'.' is not on a suitable file system for this test"
 fi
 
 mkdir d || framework_failure