diff options
| author | Bernhard Voelker <mail@bernhard-voelker.de> | 2011-12-01 01:04:34 +0100 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2011-12-01 09:07:13 +0100 |
| commit | 8df7652cfaf3286477c8c451e6a3b2ed977886bb (patch) | |
| tree | a1165bb1fcd29f8fd09c7987189b7597c8339ed8 /tests/cp | |
| parent | 92b7b7708e3767050a433e7e443861e1ecc3a150 (diff) | |
| download | coreutils-8df7652cfaf3286477c8c451e6a3b2ed977886bb.tar.xz | |
tests: adjust PATH to generally include /sbin and /usr/sbin
Commit 5eeaca94 added /sbin to the PATH for tests using mkfs. For other
tests, e.g. tests/cp-fiemap-perf using filefrag, we need /usr/sbin also.
Add both directories generally for the tests, "since many of us always
augment our PATH with all of the sbin paths all of the time anyway" (Bob
in http://lists.gnu.org/archive/html/coreutils/2011-11/msg00107.html).
The previous commit is hereby obsolete.
* tests/init.cfg (sanitize_path_): Add /sbin and /usr/sbin to PATH
unless already included. Needed for tests using admin tools like mkfs
and filefrag on systems where the user's environment does not have
these directories in the PATH.
* tests/init.cfg (require_mkfs_PATH_): Remove obsolete function.
* tests/cp/cp-a-selinux: Remove require_mkfs_PATH_ call.
* tests/cp/cp-mv-enotsup-xattr: Likewise.
* tests/cp/sparse-fiemap: Likewise.
* tests/mkdir/writable-under-readonly: Likewise.
* tests/rm/read-only: Likewise.
Diffstat (limited to 'tests/cp')
| -rwxr-xr-x | tests/cp/cp-a-selinux | 1 | ||||
| -rwxr-xr-x | tests/cp/cp-mv-enotsup-xattr | 1 | ||||
| -rwxr-xr-x | tests/cp/sparse-fiemap | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/tests/cp/cp-a-selinux b/tests/cp/cp-a-selinux index 7ef24d801..fd0ddaba0 100755 --- a/tests/cp/cp-a-selinux +++ b/tests/cp/cp-a-selinux @@ -23,7 +23,6 @@ print_ver_ cp require_root_ require_selinux_ -require_mkfs_PATH_ cwd=`pwd` cleanup_() { cd /; umount "$cwd/mnt"; } diff --git a/tests/cp/cp-mv-enotsup-xattr b/tests/cp/cp-mv-enotsup-xattr index f30358136..17ac6a4b4 100755 --- a/tests/cp/cp-mv-enotsup-xattr +++ b/tests/cp/cp-mv-enotsup-xattr @@ -22,7 +22,6 @@ print_ver_ cp mv require_root_ -require_mkfs_PATH_ cwd=`pwd` cleanup_() { cd /; umount "$cwd/noxattr"; umount "$cwd/xattr"; } diff --git a/tests/cp/sparse-fiemap b/tests/cp/sparse-fiemap index 831bf0bdd..5eedb4fa7 100755 --- a/tests/cp/sparse-fiemap +++ b/tests/cp/sparse-fiemap @@ -32,7 +32,6 @@ else # It's not; we need to create one, hence we need root access. require_root_ - require_mkfs_PATH_ cwd=$PWD cleanup_() { cd /; umount "$cwd/mnt"; } |