From 39137a5d05df940410261f4cad2e4a695faf0f7f Mon Sep 17 00:00:00 2001 From: Jim Meyering 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/sample-test | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/sample-test') diff --git a/tests/sample-test b/tests/sample-test index e1d0d939f..0da0bca95 100644 --- a/tests/sample-test +++ b/tests/sample-test @@ -23,9 +23,9 @@ fi # FIXME: . $srcdir/../envvar-check # FIXME: . $srcdir/../lang-default -# FIXME: PRIV_CHECK_ARG=require-root . $srcdir/../priv-check . $srcdir/../test-lib.sh -# FIXME skip_if_root_ +# FIXME: skip_if_root_ +# FIXME: require_root_ # If used, these must *follow* test-lib.sh. # FIXME: cleanup_() { rm -rf "$other_partition_tmpdir"; } -- cgit v1.2.3-70-g09d2