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/priv-check | 92 -------------------------------------------------------- 1 file changed, 92 deletions(-) delete mode 100644 tests/priv-check (limited to 'tests/priv-check') diff --git a/tests/priv-check b/tests/priv-check deleted file mode 100644 index 7d7b1fead..000000000 --- a/tests/priv-check +++ /dev/null @@ -1,92 +0,0 @@ -# -*- sh -*- -# Source this file at the beginning of a test that works -# only when run as root or as non-root. - -# Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc. - -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -case "$PRIV_CHECK_ARG" in - require-root) who='as root';; - require-non-root) who='by an unprivileged user';; - *) echo "Usage: PRIV_CHECK_ARG={require-root|require-non-root} . priv-check"\ - 1>&2; exit 1;; -esac - -# Make sure id -u succeeds. -my_uid=`id -u` -test $? = 0 || { - echo "$0: cannot run \`id -u'" 1>&2 - (exit 1); exit 1 -} - -# Make sure it gives valid output. -case $my_uid in - *[!0-9]*) - echo "$0: invalid output (\`$my_uid') from \`id -u'" 1>&2 - (exit 1); exit 1 - ;; - *) ;; -esac - -test $my_uid = 0 && \ -{ - # When running as root, always ensure that we have a valid non-root username. - # As non-root, don't do anything, since we won't be running setuidgid. - : ${NON_ROOT_USERNAME=nobody} - - # Ensure that the supplied username is valid and with UID != 0. - coreutils_non_root_uid=`id -u $NON_ROOT_USERNAME` - test $? = 0 || \ - { - echo "$0: This command failed: \`id -u $NON_ROOT_USERNAME'" 1>&2 - echo "$0: Skipping this test. To enable it, set the envvar" 1>&2 - echo "$0: NON_ROOT_USERNAME to a non-root user name." 1>&2 - (exit 77); exit 77 - } - test "$coreutils_non_root_uid" = 0 && \ - { - echo "$0: The specified NON_ROOT_USERNAME ($NON_ROOT_USERNAME)" 1>&2 - echo "$0: is invalid because its UID is 0." 1>&2 - (exit 1); exit 1 - } -} - -give_msg=no -case $PRIV_CHECK_ARG:$my_uid in - require-root:0) ;; - require-root:*) give_msg=yes ;; - require-non-root:0) - # `.' must be writable by $NON_ROOT_USERNAME - setuidgid $NON_ROOT_USERNAME test -w . || - { - echo "$0: `pwd`: not writable by user \`$NON_ROOT_USERNAME'" 1>&2 - echo "$0: skipping this test" 1>&2 - (exit 77); exit 77 - } - exec setuidgid $NON_ROOT_USERNAME env PATH="$PATH" $0 - ;; - require-non-root:*) ;; -esac - -test $give_msg = yes && { - cat <