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.

8 files changed, 12 insertions, 12 deletions

diff --git a/tests/du/2g b/tests/du/2g
index 553dc509d..280ba30f8 100755
--- a/tests/du/2g
+++ b/tests/du/2g
@@ -33,14 +33,14 @@ very_expensive_
 free_kb=`df -kP .|tail -1|sed 's/ [0-9][0-9]*%.*//;s/ *$//;s/.* //'`
 case "$free_kb" in
   [0-9]*) ;;
-  *) skip_test_ "invalid size from df: $free_kb";;
+  *) skip_ "invalid size from df: $free_kb";;
 esac
 
 # Require about 3GB free.
 min_kb=3000000
 test $min_kb -lt $free_kb ||
 {
-  skip_test_ \
+  skip_ \
     "too little free space on current partition: $free_kb (need $min_kb KB)"
 }
 
diff --git a/tests/du/8gb b/tests/du/8gb
index 2bd430644..ab283e42e 100755
--- a/tests/du/8gb
+++ b/tests/du/8gb
@@ -23,7 +23,7 @@ require_sparse_support_
 
 dd bs=1 seek=8G of=big < /dev/null 2> /dev/null
 if test $? != 0; then
-  skip_test_ 'cannot create a file large enough for this test; possibly
+  skip_ 'cannot create a file large enough for this test; possibly
 because file offsets are only 32 bits on this file system'
 fi
 
@@ -35,7 +35,7 @@ fi
 set x `ls -gG big`
 size=$4
 if test "$size" = 0; then
-  skip_test_ "cannot create a file large enough for this test
+  skip_ "cannot create a file large enough for this test
 possibly because this system's NFS support is buggy
 Consider rerunning this test on a different file system."
 fi
diff --git a/tests/du/bigtime b/tests/du/bigtime
index 1498719f5..b33b80126 100755
--- a/tests/du/bigtime
+++ b/tests/du/bigtime
@@ -30,11 +30,11 @@ case "$future_time" in
 *" $bignum "*)
   : ;;
 *' Dec  4  300627798676 '*)
-  skip_test_ "file system and localtime both handle big timestamps" ;;
+  skip_ "file system and localtime both handle big timestamps" ;;
 *)
-  skip_test_ "file system or localtime mishandles big time stamps:" \
+  skip_ "file system or localtime mishandles big time stamps:" \
       "$future_time" ;;
-esac || skip_test_ "file system cannot represent big time stamps"
+esac || skip_ "file system cannot represent big time stamps"
 
 printf "0\t$bignum\tfuture\n" > exp || framework_failure_
 printf "du: time $bignum is out of range\n" > err_ok || framework_failure_
diff --git a/tests/du/files0-from-dir b/tests/du/files0-from-dir
index a72212239..fc1e1844c 100755
--- a/tests/du/files0-from-dir
+++ b/tests/du/files0-from-dir
@@ -25,7 +25,7 @@ mkdir dir
 # In that case, using --files0-from=dir would yield garbage,
 # interpreting the directory entry as a sequence of
 # NUL-separated file names.
-cat dir > /dev/null && skip_test_ "cat dir/ succeeds"
+cat dir > /dev/null && skip_ "cat dir/ succeeds"
 
 for prog in du wc; do
   $prog --files0-from=dir > /dev/null 2>err && fail=1
diff --git a/tests/du/long-from-unreadable b/tests/du/long-from-unreadable
index 43ef60dfb..92cd3788c 100755
--- a/tests/du/long-from-unreadable
+++ b/tests/du/long-from-unreadable
@@ -33,7 +33,7 @@ print_ver_ du
 
 proc_file=/proc/self/fd
 if test ! -d $proc_file; then
-  skip_test_ 'This test would fail, since your system lacks /proc support.'
+  skip_ 'This test would fail, since your system lacks /proc support.'
 fi
 
 dir=`printf '%200s\n' ' '|tr ' ' x`
diff --git a/tests/du/long-sloop b/tests/du/long-sloop
index 117e9da14..1f46a4a40 100755
--- a/tests/du/long-sloop
+++ b/tests/du/long-sloop
@@ -54,7 +54,7 @@ echo foo > $i
 # name traversal exceeds MAXSYMLINKS'.
 
 cat $file > /dev/null 2> err &&
-    skip_test_ 'Your system appears to be able to handle more than $n symlinks
+    skip_ 'Your system appears to be able to handle more than $n symlinks
 in file name resolution'
 too_many=`sed 's/.*: //' err`
 
diff --git a/tests/du/move-dir-while-traversing b/tests/du/move-dir-while-traversing
index 0270389a6..68302b8ff 100755
--- a/tests/du/move-dir-while-traversing
+++ b/tests/du/move-dir-while-traversing
@@ -21,7 +21,7 @@ print_ver_ du
 
 # We use a python-inotify script, so...
 python -m pyinotify -h > /dev/null \
-  || skip_test_ 'python inotify package not installed'
+  || skip_ 'python inotify package not installed'
 
 # Move a directory "up" while du is processing its sub-directories.
 # While du is processing a hierarchy .../B/C/D/... this script
diff --git a/tests/du/slink b/tests/du/slink
index c20d753ec..7f6c79d3e 100755
--- a/tests/du/slink
+++ b/tests/du/slink
@@ -27,7 +27,7 @@ require_local_dir_
 if df --type=xfs . >/dev/null 2>&1; then
   # At least on Irix-6.5.19, when using an xfs file system,
   # each created symlink (name lengths up to 255) would have a size of `0'.
-  skip_test_ "\`.' is on an XFS file system"
+  skip_ "\`.' is on an XFS file system"
 fi
 
 symlink_name_lengths='1 15 16 31 32 59 60 63 64 127 128 255 256 511 512 1024'