From 2e580ca741b83202e6b22e0bb58b18101a443bd8 Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Tue, 14 Jun 2011 16:22:41 +0200
Subject: 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.
---
 tests/rm/ext3-perf       | 4 ++--
 tests/rm/fail-2eperm     | 2 +-
 tests/rm/isatty          | 2 +-
 tests/rm/one-file-system | 2 +-
 tests/rm/read-only       | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'tests/rm')

diff --git a/tests/rm/ext3-perf b/tests/rm/ext3-perf
index efaaf67fc..95cce33d4 100755
--- a/tests/rm/ext3-perf
+++ b/tests/rm/ext3-perf
@@ -41,13 +41,13 @@ n=400000
 # FIXME-maybe: try to find a suitable file system or allow
 # the user to specify it via an envvar.
 df -T -t ext3 -t ext4dev -t ext4 . \
-  || skip_test_ 'this test runs only on an ext3 or ext4 file system'
+  || skip_ 'this test runs only on an ext3 or ext4 file system'
 
 # Skip if there are too few inodes free.  Require some slack.
 free_inodes=$(stat -f --format=%d .) || framework_failure
 min_free_inodes=$(expr 12 \* $n / 10)
 test $min_free_inodes -lt $free_inodes \
-  || skip_test_ "too few free inodes on '.': $free_inodes;" \
+  || skip_ "too few free inodes on '.': $free_inodes;" \
       "this test requires at least $min_free_inodes"
 
 ok=0
diff --git a/tests/rm/fail-2eperm b/tests/rm/fail-2eperm
index 92d19ecd6..4137d9dac 100755
--- a/tests/rm/fail-2eperm
+++ b/tests/rm/fail-2eperm
@@ -37,7 +37,7 @@ rm_version=`
 `
 case $rm_version in
   $PACKAGE_VERSION) ;;
-  *) skip_test_ "cannot access just-built rm as user $NON_ROOT_USERNAME";;
+  *) skip_ "cannot access just-built rm as user $NON_ROOT_USERNAME";;
 esac
 setuidgid $NON_ROOT_USERNAME env PATH="$PATH" rm -rf a 2> out-t && fail=1
 
diff --git a/tests/rm/isatty b/tests/rm/isatty
index ea2daba20..1118b9465 100755
--- a/tests/rm/isatty
+++ b/tests/rm/isatty
@@ -23,7 +23,7 @@ skip_if_root_
 
 # Skip this test if there is no /dev/stdin file.
 ls /dev/stdin >/dev/null 2>&1 \
-  || skip_test_ 'there is no /dev/stdin file'
+  || skip_ 'there is no /dev/stdin file'
 
 touch f
 chmod 0 f
diff --git a/tests/rm/one-file-system b/tests/rm/one-file-system
index 36990b208..1ef61a735 100755
--- a/tests/rm/one-file-system
+++ b/tests/rm/one-file-system
@@ -33,7 +33,7 @@ cleanup_()
 t=$other_partition_tmpdir
 mkdir -p a/b $t/y
 mount --bind $t a/b \
-  || skip_test_ "This test requires mount with a working --bind option."
+  || skip_ "This test requires mount with a working --bind option."
 
 cat <<\EOF > exp || framework_failure
 rm: skipping `a/b', since it's on a different device
diff --git a/tests/rm/read-only b/tests/rm/read-only
index 35919d39f..c52883b60 100755
--- a/tests/rm/read-only
+++ b/tests/rm/read-only
@@ -29,7 +29,7 @@ dd if=/dev/zero of=blob bs=8192 count=200 > /dev/null 2>&1 \
                                              || skip=1
 mkdir mnt                                    || skip=1
 mkfs -t ext2 -F blob \
-  || skip_test_ "failed to create ext2 file system"
+  || skip_ "failed to create ext2 file system"
 
 mount -oloop blob mnt                        || skip=1
 echo test > mnt/f                            || skip=1
@@ -37,7 +37,7 @@ test -s mnt/f                                || skip=1
 mount -o remount,loop,ro mnt                 || skip=1
 
 test $skip = 1 \
-  && skip_test_ "insufficient mount/ext2 support"
+  && skip_ "insufficient mount/ext2 support"
 
 # Applying rm -f to a nonexistent file on a read-only file system must succeed.
 rm -f mnt/no-such > out 2>&1 || fail=1
-- 
cgit v1.2.3-54-g00ecf