tests: Add directories with different permissions to perms/

20 files changed, 103 insertions, 80 deletions

diff --git a/tests/bsd/perm_000_plus.out b/tests/bsd/perm_000_plus.out
index d7494b8..42f2fed 100644
--- a/tests/bsd/perm_000_plus.out
+++ b/tests/bsd/perm_000_plus.out
@@ -1,8 +1,10 @@
 perms
-perms/0
-perms/r
-perms/rw
-perms/rwx
-perms/rx
-perms/w
-perms/wx
+perms/dr-x
+perms/drwx
+perms/f---
+perms/f-w-
+perms/f-wx
+perms/fr--
+perms/fr-x
+perms/frw-
+perms/frwx
diff --git a/tests/bsd/perm_222_plus.out b/tests/bsd/perm_222_plus.out
index 9a5b95a..5c78ecc 100644
--- a/tests/bsd/perm_222_plus.out
+++ b/tests/bsd/perm_222_plus.out
@@ -1,5 +1,6 @@
 perms
-perms/rw
-perms/rwx
-perms/w
-perms/wx
+perms/drwx
+perms/f-w-
+perms/f-wx
+perms/frw-
+perms/frwx
diff --git a/tests/bsd/perm_644_plus.out b/tests/bsd/perm_644_plus.out
index 7e5ae98..774c0ea 100644
--- a/tests/bsd/perm_644_plus.out
+++ b/tests/bsd/perm_644_plus.out
@@ -1,7 +1,9 @@
 perms
-perms/r
-perms/rw
-perms/rwx
-perms/rx
-perms/w
-perms/wx
+perms/dr-x
+perms/drwx
+perms/f-w-
+perms/f-wx
+perms/fr--
+perms/fr-x
+perms/frw-
+perms/frwx
diff --git a/tests/gnu/executable.out b/tests/gnu/executable.out
index 49c1b21..08965bf 100644
--- a/tests/gnu/executable.out
+++ b/tests/gnu/executable.out
@@ -1,4 +1,6 @@
 perms
-perms/rwx
-perms/rx
-perms/wx
+perms/dr-x
+perms/drwx
+perms/f-wx
+perms/fr-x
+perms/frwx
diff --git a/tests/gnu/perm_000_slash.out b/tests/gnu/perm_000_slash.out
index d7494b8..42f2fed 100644
--- a/tests/gnu/perm_000_slash.out
+++ b/tests/gnu/perm_000_slash.out
@@ -1,8 +1,10 @@
 perms
-perms/0
-perms/r
-perms/rw
-perms/rwx
-perms/rx
-perms/w
-perms/wx
+perms/dr-x
+perms/drwx
+perms/f---
+perms/f-w-
+perms/f-wx
+perms/fr--
+perms/fr-x
+perms/frw-
+perms/frwx
diff --git a/tests/gnu/perm_222_slash.out b/tests/gnu/perm_222_slash.out
index 9a5b95a..5c78ecc 100644
--- a/tests/gnu/perm_222_slash.out
+++ b/tests/gnu/perm_222_slash.out
@@ -1,5 +1,6 @@
 perms
-perms/rw
-perms/rwx
-perms/w
-perms/wx
+perms/drwx
+perms/f-w-
+perms/f-wx
+perms/frw-
+perms/frwx
diff --git a/tests/gnu/perm_644_slash.out b/tests/gnu/perm_644_slash.out
index 7e5ae98..774c0ea 100644
--- a/tests/gnu/perm_644_slash.out
+++ b/tests/gnu/perm_644_slash.out
@@ -1,7 +1,9 @@
 perms
-perms/r
-perms/rw
-perms/rwx
-perms/rx
-perms/w
-perms/wx
+perms/dr-x
+perms/drwx
+perms/f-w-
+perms/f-wx
+perms/fr--
+perms/fr-x
+perms/frw-
+perms/frwx
diff --git a/tests/gnu/perm_leading_plus_symbolic_slash.out b/tests/gnu/perm_leading_plus_symbolic_slash.out
index 7e5ae98..774c0ea 100644
--- a/tests/gnu/perm_leading_plus_symbolic_slash.out
+++ b/tests/gnu/perm_leading_plus_symbolic_slash.out
@@ -1,7 +1,9 @@
 perms
-perms/r
-perms/rw
-perms/rwx
-perms/rx
-perms/w
-perms/wx
+perms/dr-x
+perms/drwx
+perms/f-w-
+perms/f-wx
+perms/fr--
+perms/fr-x
+perms/frw-
+perms/frwx
diff --git a/tests/gnu/perm_symbolic_slash.out b/tests/gnu/perm_symbolic_slash.out
index 7e5ae98..774c0ea 100644
--- a/tests/gnu/perm_symbolic_slash.out
+++ b/tests/gnu/perm_symbolic_slash.out
@@ -1,7 +1,9 @@
 perms
-perms/r
-perms/rw
-perms/rwx
-perms/rx
-perms/w
-perms/wx
+perms/dr-x
+perms/drwx
+perms/f-w-
+perms/f-wx
+perms/fr--
+perms/fr-x
+perms/frw-
+perms/frwx
diff --git a/tests/gnu/readable.out b/tests/gnu/readable.out
index 386feba..285aa43 100644
--- a/tests/gnu/readable.out
+++ b/tests/gnu/readable.out
@@ -1,5 +1,7 @@
 perms
-perms/r
-perms/rw
-perms/rwx
-perms/rx
+perms/dr-x
+perms/drwx
+perms/fr--
+perms/fr-x
+perms/frw-
+perms/frwx
diff --git a/tests/gnu/writable.out b/tests/gnu/writable.out
index 9a5b95a..5c78ecc 100644
--- a/tests/gnu/writable.out
+++ b/tests/gnu/writable.out
@@ -1,5 +1,6 @@
 perms
-perms/rw
-perms/rwx
-perms/w
-perms/wx
+perms/drwx
+perms/f-w-
+perms/f-wx
+perms/frw-
+perms/frwx
diff --git a/tests/posix/perm_000.out b/tests/posix/perm_000.out
index 5fd30bc..b46af62 100644
--- a/tests/posix/perm_000.out
+++ b/tests/posix/perm_000.out
@@ -1 +1 @@
-perms/0
+perms/f---
diff --git a/tests/posix/perm_000_minus.out b/tests/posix/perm_000_minus.out
index d7494b8..42f2fed 100644
--- a/tests/posix/perm_000_minus.out
+++ b/tests/posix/perm_000_minus.out
@@ -1,8 +1,10 @@
 perms
-perms/0
-perms/r
-perms/rw
-perms/rwx
-perms/rx
-perms/w
-perms/wx
+perms/dr-x
+perms/drwx
+perms/f---
+perms/f-w-
+perms/f-wx
+perms/fr--
+perms/fr-x
+perms/frw-
+perms/frwx
diff --git a/tests/posix/perm_222.out b/tests/posix/perm_222.out
index 1690e43..4876193 100644
--- a/tests/posix/perm_222.out
+++ b/tests/posix/perm_222.out
@@ -1 +1 @@
-perms/w
+perms/f-w-
diff --git a/tests/posix/perm_222_minus.out b/tests/posix/perm_222_minus.out
index 1690e43..4876193 100644
--- a/tests/posix/perm_222_minus.out
+++ b/tests/posix/perm_222_minus.out
@@ -1 +1 @@
-perms/w
+perms/f-w-
diff --git a/tests/posix/perm_644.out b/tests/posix/perm_644.out
index 4e64e49..4598cc1 100644
--- a/tests/posix/perm_644.out
+++ b/tests/posix/perm_644.out
@@ -1 +1 @@
-perms/rw
+perms/frw-
diff --git a/tests/posix/perm_644_minus.out b/tests/posix/perm_644_minus.out
index 2e2576b..9e041c3 100644
--- a/tests/posix/perm_644_minus.out
+++ b/tests/posix/perm_644_minus.out
@@ -1,3 +1,4 @@
 perms
-perms/rw
-perms/rwx
+perms/drwx
+perms/frw-
+perms/frwx
diff --git a/tests/posix/perm_symbolic_minus.out b/tests/posix/perm_symbolic_minus.out
index 2e2576b..9e041c3 100644
--- a/tests/posix/perm_symbolic_minus.out
+++ b/tests/posix/perm_symbolic_minus.out
@@ -1,3 +1,4 @@
 perms
-perms/rw
-perms/rwx
+perms/drwx
+perms/frw-
+perms/frwx
diff --git a/tests/posix/permcopy.out b/tests/posix/permcopy.out
index 4e64e49..4598cc1 100644
--- a/tests/posix/permcopy.out
+++ b/tests/posix/permcopy.out
@@ -1 +1 @@
-perms/rw
+perms/frw-
diff --git a/tests/stddirs.sh b/tests/stddirs.sh
index 8f8440d..b908ebe 100644
--- a/tests/stddirs.sh
+++ b/tests/stddirs.sh
@@ -14,13 +14,13 @@ make_basic() {
 
 # Creates a file+directory structure with various permissions for tests
 make_perms() {
-    "$XTOUCH" -p -M000 "$1/0"
-    "$XTOUCH" -p -M444 "$1/r"
-    "$XTOUCH" -p -M222 "$1/w"
-    "$XTOUCH" -p -M644 "$1/rw"
-    "$XTOUCH" -p -M555 "$1/rx"
-    "$XTOUCH" -p -M311 "$1/wx"
-    "$XTOUCH" -p -M755 "$1/rwx"
+    "$XTOUCH" -p -M000 "$1/f---"
+    "$XTOUCH" -p -M444 "$1/fr--"
+    "$XTOUCH" -p -M222 "$1/f-w-"
+    "$XTOUCH" -p -M644 "$1/frw-"
+    "$XTOUCH" -p -M311 "$1/f-wx"
+    "$XTOUCH" -p -M555 "$1/fr-x" "$1/dr-x/"
+    "$XTOUCH" -p -M755 "$1/frwx" "$1/drwx/"
 }
 
 # Creates a file+directory structure with various symbolic and hard links