Date: Mon, 11 Oct 2010 23:24:57 +0000 (UTC) From: "David E. O'Brien" <obrien@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r213713 - head/tools/regression/bin/sh/builtins Message-ID: <201010112324.o9BNOveI030977@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: obrien Date: Mon Oct 11 23:24:57 2010 New Revision: 213713 URL: http://svn.freebsd.org/changeset/base/213713 Log: Correct regression test to not show a false positive when run as root. Modified: head/tools/regression/bin/sh/builtins/cd1.0 Modified: head/tools/regression/bin/sh/builtins/cd1.0 ============================================================================== --- head/tools/regression/bin/sh/builtins/cd1.0 Mon Oct 11 23:15:18 2010 (r213712) +++ head/tools/regression/bin/sh/builtins/cd1.0 Mon Oct 11 23:24:57 2010 (r213713) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201010112324.o9BNOveI030977>