diff options
| author | Jim Meyering <meyering@redhat.com> | 2009-02-27 09:16:45 +0100 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2009-03-02 09:35:12 +0100 |
| commit | 0433f90e3d388734888dad17f5fc2f106c59faf4 (patch) | |
| tree | 331e116c9ef593d41f194da801149eeb91ec56ef | |
| parent | 1c7d5b58476d5bf5ab8db5d025b7d0820611aae7 (diff) | |
| download | coreutils-0433f90e3d388734888dad17f5fc2f106c59faf4.tar.xz | |
tests: reflect the s/+/./ SELinux indicator change
* tests/mkdir/perm: Now that this test is no longer always skipped,
make it work independently of ls: use stat, not ls, to get perm string.
* test-lib.sh (rwx_to_mode_): Use stat, not ls to get perm string
This test was run only when RUN_VERY_EXPENSIVE_TESTS=yes was set.
| -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 |