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. --- Makefile.maint | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile.maint') diff --git a/Makefile.maint b/Makefile.maint index ba3c55ebb..3fbfa422b 100644 --- a/Makefile.maint +++ b/Makefile.maint @@ -246,7 +246,7 @@ sc_root_tests: @if test -d tests \ && grep check-root tests/Makefile.am>/dev/null 2>&1; then \ t1=sc-root.expected; t2=sc-root.actual; \ - grep -nl '^PRIV_CHECK_ARG=require-root' \ + grep -nl '^require_root_$$' \ $$($(CVS_LIST) tests) |sed s,tests,., |sort > $$t1; \ sed -n 's, cd \([^ ]*\) .*MAKE..check TESTS=\(.*\),./\1/\2,p' \ $(srcdir)/tests/Makefile.am |sort > $$t2; \ -- cgit v1.2.3-54-g00ecf