summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rwxr-xr-xtests/cp/parent-perm11
2 files changed, 14 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index c38ab7331..e834634c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2008-01-08 Jim Meyering <meyering@redhat.com>
+ parent-perm: avoid a bizarre test failure.
+ * tests/cp/parent-perm: Accommodate the situation in which
+ chmod ("dir", 02755) returns 0 yet fails to set the S_ISGID bit.
+
Remove uses of now-undefined Makefile variable.
* src/Makefile.am (dir_LDADD, ls_LDADD, vdir_LDADD): Remove uses
of no-longer-defined variable, $(LIB_ACL_TRIVIAL).
diff --git a/tests/cp/parent-perm b/tests/cp/parent-perm
index 1c7a222bb..cedcac4df 100755
--- a/tests/cp/parent-perm
+++ b/tests/cp/parent-perm
@@ -33,6 +33,15 @@ cp -p --parent a/b/d/foo e || fail=1
# Ensure that permissions on just-created directory, e/a/,
# are the same as those on original, a/.
-test $(stat --printf %A a) = $(stat --printf %A e/a) || fail=1
+
+# The sed filter maps any 's' from an inherited set-GID bit
+# to the usual 'x'. Otherwise, under unusual circumstances, this
+# test would fail with e.g., drwxr-sr-x != drwxr-xr-x .
+# For reference, the unusual circumstances is: build dir is set-gid,
+# so "a/" inherits that. However, when the user does not belong to
+# the group of the build directory, chmod ("a/e", 02755) returns 0,
+# yet fails to set the S_ISGID bit.
+test $(stat --printf %A a|sed s/s/x/g) = $(stat --printf %A e/a|sed s/s/x/g) ||
+ fail=1
(exit $fail); exit $fail