From f3a25b2e54ec8d09f6f97fb1946be7e9832fd81c Mon Sep 17 00:00:00 2001 From: jilles Date: Wed, 6 Mar 2013 21:30:42 +0000 Subject: [PATCH] MFC r213713 by obrien: Correct regression test to not show a false positive when run as root. git-svn-id: svn://svn.freebsd.org/base/stable/8@247901 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- tools/regression/bin/sh/builtins/cd1.0 | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/tools/regression/bin/sh/builtins/cd1.0 b/tools/regression/bin/sh/builtins/cd1.0 index b6151743e..8c6953641 100644 --- a/tools/regression/bin/sh/builtins/cd1.0 +++ b/tools/regression/bin/sh/builtins/cd1.0 @@ -6,12 +6,15 @@ cd $P T=$(mktemp -d sh-test.XXXXXX) chmod 0 $T -cd -L $T 2>/dev/null && exit 1 -[ "$PWD" = "$P" ] -[ "$(pwd)" = "$P" ] -cd -P $T 2>/dev/null && exit 1 -[ "$PWD" = "$P" ] -[ "$(pwd)" = "$P" ] +if [ `id -u` -ne 0 ]; then + # Root can always cd, irregardless of directory permissions. + cd -L $T 2>/dev/null && exit 1 + [ "$PWD" = "$P" ] + [ "$(pwd)" = "$P" ] + cd -P $T 2>/dev/null && exit 1 + [ "$PWD" = "$P" ] + [ "$(pwd)" = "$P" ] +fi chmod 755 $T cd $T -- 2.45.0