diff options
| author | Pádraig Brady <P@draigBrady.com> | 2014-05-19 18:21:57 +0100 |
|---|---|---|
| committer | Pádraig Brady <P@draigBrady.com> | 2014-05-21 11:18:27 +0100 |
| commit | 7a63d6395ac117b753a18468a9b3f5ed95d176d4 (patch) | |
| tree | c01b1115f71bd4a4b98b1dc6f9383d4228507e5f /tests/rm/fail-2eperm.sh | |
| parent | 0c4729516baa2fbefb0af66c38f434b1f7519078 (diff) | |
| download | coreutils-7a63d6395ac117b753a18468a9b3f5ed95d176d4.tar.xz | |
tests: use chroot --user rather than internal setuidgid tool
* init.cfg (require_root_): Adjust to use chroot, and make
`require_built_ chroot` implicit when chroot used in the test.
* po/POTFILES.in: Remove reference to setuidgid tool.
* src/.gitignore: Likewise.
* src/local.mk: Likewise.
* src/setuidgid.c: Remove.
* tests/cp/preserve-gid.sh: s/setuidgid/chroot --user/.
* tests/cp/special-bits.sh: Likewise.
* tests/id/setgid.sh: Likewise.
* tests/misc/truncate-owned-by-other.sh
* tests/mv/sticky-to-xpart.sh: Likewise.
* tests/rm/fail-2eperm.sh: Likewise.
* tests/rm/no-give-up.sh: Likewise.
* tests/touch/now-owned-by-other.sh: Likewise.
* tests/misc/chroot-fail.sh: Skip if chroot not built.
Diffstat (limited to 'tests/rm/fail-2eperm.sh')
| -rwxr-xr-x | tests/rm/fail-2eperm.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/rm/fail-2eperm.sh b/tests/rm/fail-2eperm.sh index e040d00dc..6e8ce9ba3 100755 --- a/tests/rm/fail-2eperm.sh +++ b/tests/rm/fail-2eperm.sh @@ -32,14 +32,14 @@ touch a/b || framework_failure_ # Try to ensure that $NON_ROOT_USERNAME can access # the required version of rm. rm_version=$( - setuidgid $NON_ROOT_USERNAME env PATH="$PATH" rm --version | + chroot --user=$NON_ROOT_USERNAME / env PATH="$PATH" rm --version | sed -n '1s/.* //p' ) case $rm_version in $PACKAGE_VERSION) ;; *) 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 +chroot --user=$NON_ROOT_USERNAME / env PATH="$PATH" rm -rf a 2> out-t && fail=1 # On some systems, we get 'Not owner'. Convert it. # On other systems (HPUX), we get 'Permission denied'. Convert it, too. |