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
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to