summaryrefslogtreecommitdiffstats
path: root/tools/regression/fstest/tests/chown/00.t
diff options
context:
space:
mode:
Diffstat (limited to 'tools/regression/fstest/tests/chown/00.t')
-rw-r--r--tools/regression/fstest/tests/chown/00.t46
1 files changed, 23 insertions, 23 deletions
diff --git a/tools/regression/fstest/tests/chown/00.t b/tools/regression/fstest/tests/chown/00.t
index 154129a..103ff59 100644
--- a/tools/regression/fstest/tests/chown/00.t
+++ b/tools/regression/fstest/tests/chown/00.t
@@ -61,7 +61,7 @@ expect 0 unlink ${n1}
expect 0 create ${n0} 0644
expect 0 chown ${n0} 65534 65533
expect 65534,65533 lstat ${n0} uid,gid
-expect 0 -u 65534 -g 65532,65531 chown ${n0} -1 65532
+expect 0 -u 65534 -g 65532,65531 -- chown ${n0} -1 65532
expect 65534,65532 lstat ${n0} uid,gid
expect 0 -u 65534 -g 65532,65531 chown ${n0} 65534 65531
expect 65534,65531 lstat ${n0} uid,gid
@@ -72,17 +72,17 @@ expect 0 unlink ${n0}
# 39
expect 0 create ${n0} 0644
expect 0 chown ${n0} 65534 65533
-expect 0 -u 65532 -g 65531 chown ${n0} -1 -1
+expect 0 -u 65532 -g 65531 -- chown ${n0} -1 -1
expect 0 unlink ${n0}
-# when super-user calls chown(2), set-uid and set-gid bits are not removed.
+# when super-user calls chown(2), set-uid and set-gid bits may be removed.
# 43
expect 0 create ${n0} 0644
expect 0 chown ${n0} 65534 65533
expect 0 chmod ${n0} 06555
expect 06555 lstat ${n0} mode
expect 0 chown ${n0} 65532 65531
-expect 06555 lstat ${n0} mode
+expect "06555|0555" lstat ${n0} mode
expect 0 unlink ${n0}
# 50
expect 0 create ${n0} 0644
@@ -90,7 +90,7 @@ expect 0 chown ${n0} 0 0
expect 0 chmod ${n0} 06555
expect 06555 lstat ${n0} mode
expect 0 chown ${n0} 65534 65533
-expect 06555 lstat ${n0} mode
+expect "06555|0555" lstat ${n0} mode
expect 0 unlink ${n0}
# 57
expect 0 create ${n0} 0644
@@ -98,11 +98,11 @@ expect 0 chown ${n0} 65534 65533
expect 0 chmod ${n0} 06555
expect 06555 lstat ${n0} mode
expect 0 chown ${n0} 0 0
-expect 06555 lstat ${n0} mode
+expect "06555|0555" lstat ${n0} mode
expect 0 unlink ${n0}
-# when non-super-user calls chown(2) successfully, set-uid and set-gid bits are
-# removed, except when both uid and gid are equal to -1.
+# when non-super-user calls chown(2) successfully, set-uid and set-gid bits may
+# be removed, except when both uid and gid are equal to -1.
# 64
expect 0 create ${n0} 0644
expect 0 chown ${n0} 65534 65533
@@ -112,12 +112,12 @@ expect 0 -u 65534 -g 65533,65532 chown ${n0} 65534 65532
expect 0555,65534,65532 lstat ${n0} mode,uid,gid
expect 0 chmod ${n0} 06555
expect 06555 lstat ${n0} mode
-expect 0 -u 65534 -g 65533,65532 chown ${n0} -1 65533
+expect 0 -u 65534 -g 65533,65532 -- chown ${n0} -1 65533
expect 0555,65534,65533 lstat ${n0} mode,uid,gid
expect 0 chmod ${n0} 06555
expect 06555 lstat ${n0} mode
-expect 0 -u 65534 -g 65533,65532 chown ${n0} -1 -1
-expect 06555,65534,65533 lstat ${n0} mode,uid,gid
+expect 0 -u 65534 -g 65533,65532 -- chown ${n0} -1 -1
+expect "06555,65534,65533|0555,65534,65533" lstat ${n0} mode,uid,gid
expect 0 unlink ${n0}
# 79
expect 0 mkdir ${n0} 0755
@@ -125,14 +125,14 @@ expect 0 chown ${n0} 65534 65533
expect 0 chmod ${n0} 06555
expect 06555 lstat ${n0} mode
expect 0 -u 65534 -g 65533,65532 chown ${n0} 65534 65532
-expect 0555,65534,65532 lstat ${n0} mode,uid,gid
+expect "0555,65534,65532|06555,65534,65532" lstat ${n0} mode,uid,gid
expect 0 chmod ${n0} 06555
expect 06555 lstat ${n0} mode
-expect 0 -u 65534 -g 65533,65532 chown ${n0} -1 65533
-expect 0555,65534,65533 lstat ${n0} mode,uid,gid
+expect 0 -u 65534 -g 65533,65532 -- chown ${n0} -1 65533
+expect "0555,65534,65533|06555,65534,65533" lstat ${n0} mode,uid,gid
expect 0 chmod ${n0} 06555
expect 06555 lstat ${n0} mode
-expect 0 -u 65534 -g 65533,65532 chown ${n0} -1 -1
+expect 0 -u 65534 -g 65533,65532 -- chown ${n0} -1 -1
expect 06555,65534,65533 lstat ${n0} mode,uid,gid
expect 0 rmdir ${n0}
# 94
@@ -145,11 +145,11 @@ if supported lchmod; then
expect 0555,65534,65532 lstat ${n0} mode,uid,gid
expect 0 lchmod ${n0} 06555
expect 06555 lstat ${n0} mode
- expect 0 -u 65534 -g 65533,65532 lchown ${n0} -1 65533
+ expect 0 -u 65534 -g 65533,65532 -- lchown ${n0} -1 65533
expect 0555,65534,65533 lstat ${n0} mode,uid,gid
expect 0 lchmod ${n0} 06555
expect 06555 lstat ${n0} mode
- expect 0 -u 65534 -g 65533,65532 lchown ${n0} -1 -1
+ expect 0 -u 65534 -g 65533,65532 -- lchown ${n0} -1 -1
expect 06555,65534,65533 lstat ${n0} mode,uid,gid
expect 0 unlink ${n0}
fi
@@ -236,7 +236,7 @@ expect 0 unlink ${n0}
expect 0 create ${n0} 0644
ctime1=`${fstest} stat ${n0} ctime`
sleep 1
-expect 0 chown ${n0} -1 -1
+expect 0 -- chown ${n0} -1 -1
ctime2=`${fstest} stat ${n0} ctime`
test_check $ctime1 -eq $ctime2
expect 0 unlink ${n0}
@@ -244,7 +244,7 @@ expect 0 unlink ${n0}
expect 0 mkdir ${n0} 0644
ctime1=`${fstest} stat ${n0} ctime`
sleep 1
-expect 0 chown ${n0} -1 -1
+expect 0 -- chown ${n0} -1 -1
ctime2=`${fstest} stat ${n0} ctime`
test_check $ctime1 -eq $ctime2
expect 0 rmdir ${n0}
@@ -252,7 +252,7 @@ expect 0 rmdir ${n0}
expect 0 mkfifo ${n0} 0644
ctime1=`${fstest} stat ${n0} ctime`
sleep 1
-expect 0 chown ${n0} -1 -1
+expect 0 -- chown ${n0} -1 -1
ctime2=`${fstest} stat ${n0} ctime`
test_check $ctime1 -eq $ctime2
expect 0 unlink ${n0}
@@ -260,7 +260,7 @@ expect 0 unlink ${n0}
expect 0 symlink ${n1} ${n0}
ctime1=`${fstest} lstat ${n0} ctime`
sleep 1
-expect 0 lchown ${n0} -1 -1
+expect 0 -- lchown ${n0} -1 -1
ctime2=`${fstest} lstat ${n0} ctime`
test_check $ctime1 -eq $ctime2
expect 0 unlink ${n0}
@@ -270,7 +270,7 @@ expect 0 unlink ${n0}
expect 0 create ${n0} 0644
ctime1=`${fstest} stat ${n0} ctime`
sleep 1
-expect EPERM -u 65534 chown ${n0} 65534 -1
+expect EPERM -u 65534 -- chown ${n0} 65534 -1
ctime2=`${fstest} stat ${n0} ctime`
test_check $ctime1 -eq $ctime2
expect 0 unlink ${n0}
@@ -278,7 +278,7 @@ expect 0 unlink ${n0}
expect 0 mkdir ${n0} 0755
ctime1=`${fstest} stat ${n0} ctime`
sleep 1
-expect EPERM -u 65534 -g 65534 chown ${n0} -1 65534
+expect EPERM -u 65534 -g 65534 -- chown ${n0} -1 65534
ctime2=`${fstest} stat ${n0} ctime`
test_check $ctime1 -eq $ctime2
expect 0 rmdir ${n0}
OpenPOWER on IntegriCloud