From 39137a5d05df940410261f4cad2e4a695faf0f7f Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Sat, 8 Dec 2007 12:29:25 +0100
Subject: tests: Remove priv-check.  Use new require_root_ function instead.

* tests/priv-check: Remove file.
* tests/Makefile.am (EXTRA_DIST): Remove priv-check.
* tests/test-lib.sh (require_root_): New function.
Use this function rather than sourcing the priv-check file.
* tests/sample-test: Use require_root_ rather than priv-check.
* tests/chown/basic: Likewise.
* tests/cp/cp-a-selinux: Likewise.
* tests/cp/preserve-gid: Likewise.
* tests/cp/special-bits: Likewise.
* tests/ls/nameless-uid: Likewise.
* tests/misc/chcon: Likewise.
* tests/mkdir/writable-under-readonly: Likewise.
* tests/mv/sticky-to-xpart: Likewise.
* tests/rm/fail-2eperm: Likewise.
* tests/rm/no-give-up: Likewise.
* tests/rm/one-file-system: Likewise.
* tests/tail-2/append-only: Likewise.
* tests/touch/now-owned-by-other: Likewise.
* tests/rm/fail-eperm: Use skip_if_root_ rather than priv-check.
* Makefile.maint (sc_root_tests): Reflect this change:
search for the new function name.
---
 tests/rm/fail-2eperm     | 2 +-
 tests/rm/fail-eperm      | 3 ++-
 tests/rm/no-give-up      | 2 +-
 tests/rm/one-file-system | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'tests/rm')

diff --git a/tests/rm/fail-2eperm b/tests/rm/fail-2eperm
index bafd5bfcc..66efbce29 100755
--- a/tests/rm/fail-2eperm
+++ b/tests/rm/fail-2eperm
@@ -23,8 +23,8 @@ if test "$VERBOSE" = yes; then
 fi
 
 . $srcdir/../lang-default
-PRIV_CHECK_ARG=require-root . $srcdir/../priv-check
 . $srcdir/../test-lib.sh
+require_root_
 
 # The containing directory must be owned by the user who eventually runs rm.
 chown $NON_ROOT_USERNAME .
diff --git a/tests/rm/fail-eperm b/tests/rm/fail-eperm
index 4abc9dec6..7bc89da15 100755
--- a/tests/rm/fail-eperm
+++ b/tests/rm/fail-eperm
@@ -27,7 +27,8 @@ fi
 # searching below.  root can simply create the required
 # dir/files and run the test as someone else.
 
-PRIV_CHECK_ARG=require-non-root . $srcdir/../priv-check
+. $srcdir/../test-lib.sh
+skip_if_root_
 
 : ${srcdir=.}
 . $srcdir/../require-perl
diff --git a/tests/rm/no-give-up b/tests/rm/no-give-up
index 14d2a4694..8a1ecdc75 100755
--- a/tests/rm/no-give-up
+++ b/tests/rm/no-give-up
@@ -22,8 +22,8 @@ if test "$VERBOSE" = yes; then
   rm --version
 fi
 
-PRIV_CHECK_ARG=require-root . $srcdir/../priv-check
 . $srcdir/../test-lib.sh
+require_root_
 
 mkdir d || framework_failure
 touch d/f || framework_failure
diff --git a/tests/rm/one-file-system b/tests/rm/one-file-system
index 471216c2c..15d327965 100755
--- a/tests/rm/one-file-system
+++ b/tests/rm/one-file-system
@@ -21,9 +21,9 @@ if test "$VERBOSE" = yes; then
   rm --version
 fi
 
-PRIV_CHECK_ARG=require-root . $srcdir/../priv-check
 . $srcdir/../lang-default
 . $srcdir/../test-lib.sh
+require_root_
 
 # If used, these must *follow* test-lib.sh.
 cleanup_() { rm -rf "$other_partition_tmpdir"; }
-- 
cgit v1.2.3-70-g09d2