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.

18 files changed, 32 insertions, 32 deletions

diff --git a/tests/misc/cat-proc b/tests/misc/cat-proc
index 3cdc2bbb7..83c173513 100755
--- a/tests/misc/cat-proc
+++ b/tests/misc/cat-proc
@@ -23,7 +23,7 @@ print_ver_ cat
 
 f=/proc/cpuinfo
 test -f $f \
-  || skip_test_ "no $f"
+  || skip_ "no $f"
 
 
 # Yes, parts of /proc/cpuinfo might change between cat runs.
diff --git a/tests/misc/env b/tests/misc/env
index 948b47527..d5e4fd627 100755
--- a/tests/misc/env
+++ b/tests/misc/env
@@ -57,7 +57,7 @@ test $? = 127 || fail=1
 # For these reasons, it is more portable to grep that our desired changes
 # took place, rather than comparing output of env over an entire environment.
 if env | grep '^ENV_TEST' >/dev/null ; then
-  skip_test_ "environment has potential interference from ENV_TEST*"
+  skip_ "environment has potential interference from ENV_TEST*"
 fi
 
 ENV_TEST1=a
diff --git a/tests/misc/nice b/tests/misc/nice
index dc4c1b2f7..f63a28ecd 100755
--- a/tests/misc/nice
+++ b/tests/misc/nice
@@ -49,7 +49,7 @@ niceness=`nice`
 if test "$niceness" = 0; then
     : ok
 else
-  skip_test_ "this test must be run at nice level 0"
+  skip_ "this test must be run at nice level 0"
 fi
 
 while :; do
diff --git a/tests/misc/od-x8 b/tests/misc/od-x8
index 7504414c3..4936109d8 100755
--- a/tests/misc/od-x8
+++ b/tests/misc/od-x8
@@ -21,7 +21,7 @@
 print_ver_ od
 
 od -t x8 /dev/null >/dev/null ||
-  skip_test_ "od lacks support for 8-byte quantities"
+  skip_ "od lacks support for 8-byte quantities"
 
 echo abcdefgh |tr -d '\n' > in || framework_failure
 
diff --git a/tests/misc/printenv b/tests/misc/printenv
index 5744afddc..607914c10 100755
--- a/tests/misc/printenv
+++ b/tests/misc/printenv
@@ -31,7 +31,7 @@ compare exp out || fail=1
 # Environment variable values may contain newlines, which cannot be
 # observed by merely inspecting output from printenv.
 if env -- printenv | grep '^ENV_TEST' >/dev/null ; then
-  skip_test_ "environment has potential interference from ENV_TEST*"
+  skip_ "environment has potential interference from ENV_TEST*"
 fi
 
 # Printing a single variable's value.
diff --git a/tests/misc/pwd-option b/tests/misc/pwd-option
index 8eaf6be8f..c90049320 100755
--- a/tests/misc/pwd-option
+++ b/tests/misc/pwd-option
@@ -29,7 +29,7 @@ test "x$PWD" = "x$base" || framework_failure
 
 # Enter a logical directory.
 cd c || framework_failure
-test "x$PWD" = "x$base/c" || skip_test_ "cd does not properly update \$PWD"
+test "x$PWD" = "x$base/c" || skip_ "cd does not properly update \$PWD"
 
 env -- pwd -L > out || fail=1
 printf %s\\n "$base/c" > exp || fail=1
diff --git a/tests/misc/selinux b/tests/misc/selinux
index d1bc9caea..df3cb3ec1 100755
--- a/tests/misc/selinux
+++ b/tests/misc/selinux
@@ -33,7 +33,7 @@ mkfifo_or_skip_ p
 ctx=root:object_r:tmp_t:s0
 
 chcon $ctx f d p ||
-  skip_test_ '"chcon '$ctx' ..." failed'
+  skip_ '"chcon '$ctx' ..." failed'
 
 # inspect that context with both ls -Z and stat.
 for i in d f p; do
diff --git a/tests/misc/seq-long-double b/tests/misc/seq-long-double
index 4d3a20880..230912cbe 100755
--- a/tests/misc/seq-long-double
+++ b/tests/misc/seq-long-double
@@ -34,7 +34,7 @@ int foo[sizeof (long double) - sizeof (double) - 1];
 #endif
 EOF
 $CC -c long.c \
-  || skip_test_ \
+  || skip_ \
      'this test runs only on systems with glibc and long double != double'
 
 a=$INTMAX_MAX
diff --git a/tests/misc/sort-continue b/tests/misc/sort-continue
index 40105d5a5..43881ac2e 100755
--- a/tests/misc/sort-continue
+++ b/tests/misc/sort-continue
@@ -21,7 +21,7 @@ print_ver_ sort
 
 # Skip the test when running under valgrind.
 ( ulimit -n 6; sort < /dev/null ) \
-  || skip_test_ 'fd-limited sort failed; are you running under valgrind?'
+  || skip_ 'fd-limited sort failed; are you running under valgrind?'
 
 for i in $(seq 31); do
   echo $i | tee -a in > __test.$i || framework_failure
diff --git a/tests/misc/sort-month b/tests/misc/sort-month
index 126c61563..1b5b76c18 100755
--- a/tests/misc/sort-month
+++ b/tests/misc/sort-month
@@ -20,7 +20,7 @@
 print_ver_ sort
 
 locale --version >/dev/null 2>&1 ||
-  skip_test_ 'The locale utility is not present'
+  skip_ 'The locale utility is not present'
 
 # C will be used if the locale is not present
 for LOC in "$LOCALE_FR" "$LOCALE_FR_UTF8" "ja_JP.utf8"; do
diff --git a/tests/misc/sort-spinlock-abuse b/tests/misc/sort-spinlock-abuse
index fc9612cfc..4cf886660 100755
--- a/tests/misc/sort-spinlock-abuse
+++ b/tests/misc/sort-spinlock-abuse
@@ -21,7 +21,7 @@
 print_ver_ sort
 
 grep '^#define HAVE_PTHREAD_T 1' "$CONFIG_HEADER" > /dev/null ||
-  skip_test_ 'requires pthreads'
+  skip_ 'requires pthreads'
 
 seq 100000 > in || framework_failure_
 mkfifo_or_skip_ fifo
diff --git a/tests/misc/sort-stale-thread-mem b/tests/misc/sort-stale-thread-mem
index 6f676eff4..5e9c0e765 100755
--- a/tests/misc/sort-stale-thread-mem
+++ b/tests/misc/sort-stale-thread-mem
@@ -23,9 +23,9 @@ print_ver_ sort
 
 very_expensive_
 
-valgrind --help >/dev/null || skip_test_ "requires valgrind"
+valgrind --help >/dev/null || skip_ "requires valgrind"
 grep '^#define HAVE_PTHREAD_T 1' "$CONFIG_HEADER" > /dev/null ||
-  skip_test_ 'requires pthreads'
+  skip_ 'requires pthreads'
 
 # gensort output seems to trigger the failure more often,
 # so prefer gensort if it is available.
diff --git a/tests/misc/sort-unique-segv b/tests/misc/sort-unique-segv
index 41eede2e7..6a40c379c 100755
--- a/tests/misc/sort-unique-segv
+++ b/tests/misc/sort-unique-segv
@@ -20,7 +20,7 @@
 print_ver_ sort
 
 grep '^#define HAVE_PTHREAD_T 1' "$CONFIG_HEADER" > /dev/null ||
-  skip_test_ 'requires pthreads'
+  skip_ 'requires pthreads'
 
 cat <<\EOF > in || framework_failure_
 
diff --git a/tests/misc/stat-nanoseconds b/tests/misc/stat-nanoseconds
index 33dc58a7a..27282f4e7 100755
--- a/tests/misc/stat-nanoseconds
+++ b/tests/misc/stat-nanoseconds
@@ -27,7 +27,7 @@ export TZ
 touch -d '1970-01-01 18:43:33.023456789' k || framework_failure_
 
 ls --full-time | grep 18:43:33.023456789 \
-  || skip_test_ this file system does not support sub-second time stamps
+  || skip_ this file system does not support sub-second time stamps
 
 test "$(stat -c       %X k)" =    67413               || fail=1
 test "$(stat -c      %.X k)" =    67413.023456789     || fail=1
diff --git a/tests/misc/stdbuf b/tests/misc/stdbuf
index 80ad870c2..ccf60b197 100755
--- a/tests/misc/stdbuf
+++ b/tests/misc/stdbuf
@@ -28,7 +28,7 @@ lf='
 '
 case $abs_top_builddir in
   *[\\\"\#\$\&\'\`$lf\ \	]*)
-    skip_test_ "unsafe absolute build directory name: $abs_top_builddir";;
+    skip_ "unsafe absolute build directory name: $abs_top_builddir";;
 esac
 
 # Use a fifo rather than a pipe in the tests below
diff --git a/tests/misc/stty-row-col b/tests/misc/stty-row-col
index d1d114368..f54ea7d58 100755
--- a/tests/misc/stty-row-col
+++ b/tests/misc/stty-row-col
@@ -52,7 +52,7 @@ NA LAST NA
 set $tests
 
 saved_size=`stty size` && test -n "$saved_size" \
-  || skip_test_ "can't get window size"
+  || skip_ "can't get window size"
 
 # Linux virtual consoles issue an error if you
 # try to increase their size.  So skip in that case.
@@ -60,7 +60,7 @@ if test "x$saved_size" != "x0 0"; then
   srow=$(echo $saved_size | cut -d ' ' -f1)
   scol=$(echo $saved_size | cut -d ' ' -f2)
   stty rows $(expr $srow + 1) cols $(expr $scol + 1) ||
-    skip_test_ "can't increase window size"
+    skip_ "can't increase window size"
 fi
 
 while :; do
diff --git a/tests/misc/tac-continue b/tests/misc/tac-continue
index 2f6e81347..0040ac60a 100755
--- a/tests/misc/tac-continue
+++ b/tests/misc/tac-continue
@@ -23,7 +23,7 @@ print_ver_ tac
 
 # See if the envvar is defined.
 if test x = "x$FULL_PARTITION_TMPDIR"; then
-  skip_test_ "FULL_PARTITION_TMPDIR not defined"
+  skip_ "FULL_PARTITION_TMPDIR not defined"
 fi
 
 if ! test -d "$FULL_PARTITION_TMPDIR"; then
diff --git a/tests/misc/xattr b/tests/misc/xattr
index 60fc24c6c..05437d037 100755
--- a/tests/misc/xattr
+++ b/tests/misc/xattr
@@ -24,7 +24,7 @@ print_ver_ cp mv ginstall
 # Skip this test if cp was built without xattr support:
 touch src dest || framework_failure
 cp --preserve=xattr -n src dest \
-  || skip_test_ "coreutils built without xattr support"
+  || skip_ "coreutils built without xattr support"
 
 # this code was taken from test mv/backup-is-src
 cleanup_() { rm -rf "$other_partition_tmpdir"; }
@@ -39,42 +39,42 @@ xattr_pair="$xattr_name=\"$xattr_value\""
 
 # create new file and check its xattrs
 touch a || framework_failure
-getfattr -d a >out_a || skip_test_ "failed to get xattr of file"
+getfattr -d a >out_a || skip_ "failed to get xattr of file"
 grep -F "$xattr_pair" out_a && framework_failure
 
 # try to set user xattr on file
 setfattr -n "$xattr_name" -v "$xattr_value" a >out_a \
-  || skip_test_ "failed to set xattr of file"
-getfattr -d a >out_a || skip_test_ "failed to get xattr of file"
+  || skip_ "failed to set xattr of file"
+getfattr -d a >out_a || skip_ "failed to get xattr of file"
 grep -F "$xattr_pair" out_a \
-  || skip_test_ "failed to set xattr of file"
+  || skip_ "failed to set xattr of file"
 
 
 # cp should not preserve xattr by default
 cp a b || fail=1
-getfattr -d b >out_b || skip_test_ "failed to get xattr of file"
+getfattr -d b >out_b || skip_ "failed to get xattr of file"
 grep -F "$xattr_pair" out_b && fail=1
 
 # test if --preserve=xattr option works
 cp --preserve=xattr a b || fail=1
-getfattr -d b >out_b || skip_test_ "failed to get xattr of file"
+getfattr -d b >out_b || skip_ "failed to get xattr of file"
 grep -F "$xattr_pair" out_b || fail=1
 
 # test if --preserve=all option works
 cp --preserve=all a c || fail=1
-getfattr -d c >out_c || skip_test_ "failed to get xattr of file"
+getfattr -d c >out_c || skip_ "failed to get xattr of file"
 grep -F "$xattr_pair" out_c || fail=1
 
 # cp's -a option must produce no diagnostics.
 cp -a a d 2>err && test -s err && fail=1
-getfattr -d d >out_d || skip_test_ "failed to get xattr of file"
+getfattr -d d >out_d || skip_ "failed to get xattr of file"
 grep -F "$xattr_pair" out_d || fail=1
 
 # test if --preserve=xattr works even for files without write access
 chmod a-w a || framework_failure
 rm -f e
 cp --preserve=xattr a e || fail=1
-getfattr -d e >out_e || skip_test_ "failed to get xattr of file"
+getfattr -d e >out_e || skip_ "failed to get xattr of file"
 grep -F "$xattr_pair" out_e || fail=1
 
 # Ensure that permission bits are preserved, too.
@@ -88,14 +88,14 @@ rm b || framework_failure
 
 # install should never preserve xattr
 ginstall a b || fail=1
-getfattr -d b >out_b || skip_test_ "failed to get xattr of file"
+getfattr -d b >out_b || skip_ "failed to get xattr of file"
 grep -F "$xattr_pair" out_b && fail=1
 
 # mv should preserve xattr when renaming within a file system.
 # This is implicitly done by rename () and doesn't need explicit
 # xattr support in mv.
 mv a b || fail=1
-getfattr -d b >out_b || skip_test_ "failed to get xattr of file"
+getfattr -d b >out_b || skip_ "failed to get xattr of file"
 grep -F "$xattr_pair" out_b || cat >&2 <<EOF
 =================================================================
 $0: WARNING!!!
@@ -116,7 +116,7 @@ if test $test_mv -eq 1; then
   # mv should preserve xattr when copying content from one partition to another
   mv b "$b_other" || fail=1
   getfattr -d "$b_other" >out_b ||
-    skip_test_ "failed to get xattr of file"
+    skip_ "failed to get xattr of file"
   grep -F "$xattr_pair" out_b || fail=1
 else
   cat >&2 <<EOF