From 699965fe41d1d1d86c3b950282a6e480cab25287 Mon Sep 17 00:00:00 2001 From: Martijn Dekker Date: Wed, 20 Jan 2021 03:54:23 +0000 Subject: [PATCH] tests/builtins.sh: don't test for x perm check as root --- src/cmd/ksh93/tests/builtins.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/cmd/ksh93/tests/builtins.sh b/src/cmd/ksh93/tests/builtins.sh index 9799257cd..fe48f1d44 100755 --- a/src/cmd/ksh93/tests/builtins.sh +++ b/src/cmd/ksh93/tests/builtins.sh @@ -811,6 +811,9 @@ e=$? "(expected status 1 and msg ending in $(printf %q "$expect"), got status $e and msg $(printf %q "$actual"))" # https://bugzilla.redhat.com/1102627 +if [[ $(id -u) == '0' ]] +then print -u2 -r "${Command}[$LINENO]: warning: running as root: skipping tests involving directory search (x) permission" +else mkdir -m 600 "$tmp/no_x_dir" expect=": cd: $tmp/no_x_dir: [Permission denied]" actual=$(cd "$tmp/no_x_dir" 2>&1) @@ -823,6 +826,7 @@ e=$? [[ e -eq 1 && $actual == *"$expect" ]] || err_exit 'can cd into a directory without x permission bit (relative path arg)' \ "(expected status 1 and msg ending in $(printf %q "$expect"), got status $e and msg $(printf %q "$actual"))" rmdir "$tmp/no_x_dir" # on HP-UX, 'rm -rf $tmp' won't work unless we rmdir this or fix the perms +fi # https://bugzilla.redhat.com/1133582 expect=$HOME