diff options
| -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 | ||||
| -rw-r--r-- | tests/init.cfg | 25 | ||||
| -rwxr-xr-x | tests/mkdir/writable-under-readonly | 1 | ||||
| -rwxr-xr-x | tests/rm/read-only | 1 |
6 files changed, 8 insertions, 22 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"; } diff --git a/tests/init.cfg b/tests/init.cfg index 9b05b3418..938d1bbab 100644 --- a/tests/init.cfg +++ b/tests/init.cfg @@ -23,6 +23,7 @@ stderr_fileno_=9 # Having an unsearchable directory in PATH causes execve to fail with EACCES # when applied to an unresolvable program name, contrary to the desired ENOENT. # Avoid the problem by rewriting PATH to exclude unsearchable directories. +# Also, if PATH lacks /sbin and/or /usr/sbin, append it/them. sanitize_path_() { # FIXME: remove double quotes around $IFS when all tests use init.sh. @@ -43,6 +44,13 @@ sanitize_path_() fi done + for d in /sbin /usr/sbin ; do + case ":$new_path:" in + *:$d:*) ;; + *) new_path="$new_path:$d" ;; + esac + done + PATH=$new_path export PATH } @@ -195,23 +203,6 @@ uid_is_privileged_() esac } -# Some versions of sudo do not include /sbin in PATH. -# Test if mkfs is in PATH, otherwise try to adapt PATH. -require_mkfs_PATH_() -{ - type mkfs && return - - case ":$PATH:" in - *:/sbin:*) skip_ "no usable mkfs found" ;; - esac - - test -x /sbin/mkfs \ - || skip_ "no usable mkfs found" - - PATH="$PATH:/sbin" - export PATH -} - get_process_status_() { sed -n '/^State:[ ]*\([[:alpha:]]\).*/s//\1/p' /proc/$1/status diff --git a/tests/mkdir/writable-under-readonly b/tests/mkdir/writable-under-readonly index 3e42b1d78..c0f83fb5b 100755 --- a/tests/mkdir/writable-under-readonly +++ b/tests/mkdir/writable-under-readonly @@ -27,7 +27,6 @@ . "${srcdir=.}/init.sh"; path_prepend_ ../src print_ver_ mkdir require_root_ -require_mkfs_PATH_ # FIXME: for now, skip it unconditionally skip_ temporarily disabled diff --git a/tests/rm/read-only b/tests/rm/read-only index 489b1bf3d..c52883b60 100755 --- a/tests/rm/read-only +++ b/tests/rm/read-only @@ -19,7 +19,6 @@ . "${srcdir=.}/init.sh"; path_prepend_ ../src print_ver_ rm require_root_ -require_mkfs_PATH_ cwd=`pwd` cleanup_() { cd /; umount "$cwd/mnt"; } |