From: Ben Walton <bwalton@artsci.utoronto.ca>
Date: Wed, 21 Sep 2011 02:57:39 +0000 (-0400)
Subject: Testsuite/dir-sgid: use symbolic mode to set sgid bit
X-Git-Tag: v3.1.0pre1~71
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8adceeb2b38a7f9f6a2c1fc5a5bf2635927a303b;p=thirdparty%2Frsync.git

Testsuite/dir-sgid: use symbolic mode to set sgid bit

The chmod on Solaris (9 and 10) cannot set the sgid bit on a directory
using absolute mode, so use symbolic mode.  Avoids a skipped test.
---

diff --git a/testsuite/dir-sgid.test b/testsuite/dir-sgid.test
index bbd86a61..44cd61e7 100644
--- a/testsuite/dir-sgid.test
+++ b/testsuite/dir-sgid.test
@@ -26,7 +26,7 @@ testit() {
 echo "File!" >"$scratchdir/file"
 echo "#!/bin/sh" >"$scratchdir/program"
 mkdir "$scratchdir/dir"
-chmod 2764 "$scratchdir/dir" || test_skipped "Can't chmod"
+chmod u=rwx,g=rw,g+s,o=r "$scratchdir/dir" || test_skipped "Can't chmod"
 chmod 664 "$scratchdir/file"
 chmod 775 "$scratchdir/program"
 [ -g "$scratchdir/dir" ] || test_skipped "The directory setgid bit vanished!"
@@ -35,7 +35,7 @@ mkdir "$scratchdir/dir/blah"
 
 # Test some target directories
 testit setgid-off 700 rw------- rwx------ rwx------
-testit setgid-on 2700 rw------- rwx------ rwx--S---
+testit setgid-on u=rwx,g=rw,g+s,o-rwx rw------- rwx------ rwx--S---
 
 # Hooray
 exit 0