From 665beee6012505d0a3e54cc06f73ef21884e889d Mon Sep 17 00:00:00 2001
From: Richard Maw <richard.maw@codethink.co.uk>
Date: Mon, 10 Oct 2011 11:25:59 +0100
Subject: Altered tests to check for sticky and setgid bits on directories

---
 tests/06_dir_diff.sh       | 24 ++++++++++++++----------
 tests/07_dir_add_remove.sh | 26 ++++++++++++++++----------
 2 files changed, 30 insertions(+), 20 deletions(-)

(limited to 'tests')

diff --git a/tests/06_dir_diff.sh b/tests/06_dir_diff.sh
index 3d8fd13..99ec034 100755
--- a/tests/06_dir_diff.sh
+++ b/tests/06_dir_diff.sh
@@ -12,20 +12,24 @@ TEST_TOOLS=$3
 ############# Test specific code ############
 
 setup () {
-	mkdir $ORIGIN/a && \
-	mkdir $TARGET/a && \
-	echo "1" > $TARGET/a/1 && \
-	chown -h :cdrom $TARGET/a && \
+	mkdir $ORIGIN/a $ORIGIN/sticky $ORIGIN/setgid &&
+	mkdir $TARGET/a $TARGET/sticky $TARGET/setgid &&
+	echo "1" > $TARGET/a/1 &&
+	chown -h :cdrom $TARGET/a &&
+	chmod +t $TARGET/sticky &&
+	chmod g+s $TARGET/setgid &&
 	chmod 707 $TARGET/a
 }
 
 check_results () {
-	test -d           $ORIGIN/a        && \
-	test -f           $ORIGIN/a/1      && \
-	check_same_mode   $ORIGIN/a $TARGET/a #&& \
-	check_same_uidgid $ORIGIN/a $TARGET/a #&& \
-	check_same_mode   $ORIGIN/a/1 $TARGET/a/1 && \
-	check_same_uidgid $ORIGIN/a/1 $TARGET/a/1 && \
+	test -d           $ORIGIN/a        &&
+	test -f           $ORIGIN/a/1      &&
+	test -k           $ORIGIN/sticky   &&
+	test -g           $ORIGIN/setgid   &&
+	check_same_mode   $ORIGIN/a $TARGET/a && \
+	check_same_uidgid $ORIGIN/a $TARGET/a && \
+	check_same_mode   $ORIGIN/a/1 $TARGET/a/1 &&
+	check_same_uidgid $ORIGIN/a/1 $TARGET/a/1 &&
 	check_content     $ORIGIN/a/1 "1"
 }
 
diff --git a/tests/07_dir_add_remove.sh b/tests/07_dir_add_remove.sh
index eed19d2..a213de1 100755
--- a/tests/07_dir_add_remove.sh
+++ b/tests/07_dir_add_remove.sh
@@ -12,19 +12,25 @@ TEST_TOOLS=$3
 ############# Test specific code ############
 
 setup () {
-	mkdir -p $ORIGIN/remove/1/2/3/4 && \
-	mkdir -p $TARGET/add/4/3/2/1 && \
-	chown -h :cdrom $TARGET/add
-	chown -h :cdrom $TARGET/add/4/3/2/1
+	mkdir -p $ORIGIN/remove/1/2/3/4 &&
+	mkdir -p $TARGET/add/4/3/2/1 &&
+	mkdir -p $TARGET/addsticky &&
+	mkdir -p $TARGET/addsetgid &&
+	chown -h :cdrom $TARGET/add &&
+	chown -h :cdrom $TARGET/add/4/3/2/1 &&
+	chmod +t $TARGET/addsticky &&
+	chmod g+s $TARGET/addsetgid
 }
 
 check_results () {
-	test   -d $ORIGIN/add/4/3/2/1    && \
-	test ! -d $ORIGIN/remove && \
-	check_same_mtime  $ORIGIN/add $TARGET/add && \
-	check_same_mode   $ORIGIN/add $TARGET/add && \
-	check_same_uidgid $ORIGIN/add $TARGET/add && \
-	check_same_mode   $ORIGIN/add $TARGET/add && \
+	test   -d $ORIGIN/add/4/3/2/1 &&
+	test ! -d $ORIGIN/remove &&
+	test   -k $ORIGIN/addsticky &&
+	test   -g $ORIGIN/addsetgid &&
+	check_same_mtime  $ORIGIN/add $TARGET/add &&
+	check_same_mode   $ORIGIN/add $TARGET/add &&
+	check_same_uidgid $ORIGIN/add $TARGET/add &&
+	check_same_mode   $ORIGIN/add $TARGET/add &&
 	check_same_uidgid $ORIGIN/add/4/3/2/1 $TARGET/add/4/3/2/1
 }
 
-- 
cgit v1.2.1