From owner-svn-src-stable@FreeBSD.ORG  Wed Mar  6 21:30:42 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id BBC7DB7;
 Wed,  6 Mar 2013 21:30:42 +0000 (UTC)
 (envelope-from jilles@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id ACCB69A2;
 Wed,  6 Mar 2013 21:30:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r26LUgnw073889;
 Wed, 6 Mar 2013 21:30:42 GMT (envelope-from jilles@svn.freebsd.org)
Received: (from jilles@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r26LUgHn073888;
 Wed, 6 Mar 2013 21:30:42 GMT (envelope-from jilles@svn.freebsd.org)
Message-Id: <201303062130.r26LUgHn073888@svn.freebsd.org>
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Wed, 6 Mar 2013 21:30:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
Subject: svn commit: r247901 - stable/8/tools/regression/bin/sh/builtins
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 06 Mar 2013 21:30:42 -0000

Author: jilles
Date: Wed Mar  6 21:30:42 2013
New Revision: 247901
URL: http://svnweb.freebsd.org/changeset/base/247901

Log:
  MFC r213713 by obrien: Correct regression test to not show a false positive
  when run as root.

Modified:
  stable/8/tools/regression/bin/sh/builtins/cd1.0
Directory Properties:
  stable/8/tools/regression/bin/sh/   (props changed)

Modified: stable/8/tools/regression/bin/sh/builtins/cd1.0
==============================================================================
--- stable/8/tools/regression/bin/sh/builtins/cd1.0	Wed Mar  6 20:02:19 2013	(r247900)
+++ stable/8/tools/regression/bin/sh/builtins/cd1.0	Wed Mar  6 21:30:42 2013	(r247901)
@@ -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