diff options
| -rwxr-xr-x | tests/mkdir/perm | 6 | ||||
| -rw-r--r-- | tests/test-lib.sh | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/mkdir/perm b/tests/mkdir/perm index 2f8715b47..2f12d073f 100755 --- a/tests/mkdir/perm +++ b/tests/mkdir/perm @@ -2,7 +2,7 @@ # Verify that mkdir's `-m MODE' option works properly # with various umask settings. -# Copyright (C) 2000, 2002-2008 Free Software Foundation, Inc. +# Copyright (C) 2000, 2002-2009 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -72,11 +72,11 @@ for p in empty -p; do mkdir $p $mode parent/sub || fail=1 - perms=`ls -ld parent | sed 's/ .*//; s/+$//'` + perms=$(stat --printf %A parent) test "$parent_perms" = "$perms" \ || { fail=1; echo parent: expected $parent_perms, got $perms; } - perms=`ls -ld parent/sub | sed 's/ .*//; s/+$//'` + perms=$(stat --printf %A parent/sub) test "$sub_perms" = "$perms" \ || { fail=1; echo parent/sub: expected $sub_perms, got $perms; } diff --git a/tests/test-lib.sh b/tests/test-lib.sh index b3aaf65db..45026f13d 100644 --- a/tests/test-lib.sh +++ b/tests/test-lib.sh @@ -136,7 +136,7 @@ rwx_to_mode_() case $rwx in [ld-][rwx-][rwx-][rwxsS-][rwx-][rwx-][rwxsS-][rwx-][rwx-][rwxtT-]) ;; - [ld-][rwx-][rwx-][rwxsS-][rwx-][rwx-][rwxsS-][rwx-][rwx-][rwxtT-]+) ;; + [ld-][rwx-][rwx-][rwxsS-][rwx-][rwx-][rwxsS-][rwx-][rwx-][rwxtT-][+.]) ;; *) echo "$0: invalid mode string: $rwx" 1>&2; return;; esac |