From owner-svn-src-all@FreeBSD.ORG  Fri Aug 13 21:17:59 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C0FD71065698;
	Fri, 13 Aug 2010 21:17:59 +0000 (UTC) (envelope-from pjd@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id AEDF38FC08;
	Fri, 13 Aug 2010 21:17:59 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o7DLHxcq007421;
	Fri, 13 Aug 2010 21:17:59 GMT (envelope-from pjd@svn.freebsd.org)
Received: (from pjd@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7DLHx44007417;
	Fri, 13 Aug 2010 21:17:59 GMT (envelope-from pjd@svn.freebsd.org)
Message-Id: <201008132117.o7DLHx44007417@svn.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Fri, 13 Aug 2010 21:17:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r211290 - head/tools/regression/fstest/tests/chflags
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 Aug 2010 21:17:59 -0000

Author: pjd
Date: Fri Aug 13 21:17:59 2010
New Revision: 211290
URL: http://svn.freebsd.org/changeset/base/211290

Log:
  - Use loops to avoid code duplication.
  - More tests.

Modified:
  head/tools/regression/fstest/tests/chflags/07.t
  head/tools/regression/fstest/tests/chflags/08.t
  head/tools/regression/fstest/tests/chflags/09.t

Modified: head/tools/regression/fstest/tests/chflags/07.t
==============================================================================
--- head/tools/regression/fstest/tests/chflags/07.t	Fri Aug 13 21:04:43 2010	(r211289)
+++ head/tools/regression/fstest/tests/chflags/07.t	Fri Aug 13 21:17:59 2010	(r211290)
@@ -8,7 +8,7 @@ dir=`dirname $0`
 
 require chflags
 
-echo "1..30"
+echo "1..93"
 
 n0=`namegen`
 n1=`namegen`
@@ -18,37 +18,33 @@ expect 0 mkdir ${n0} 0755
 cdir=`pwd`
 cd ${n0}
 
-expect 0 create ${n1} 0644
-expect EPERM -u 65534 -g 65534 chflags ${n1} UF_NODUMP
-expect none stat ${n1} flags
-expect 0 chown ${n1} 65534 65534
-expect EPERM -u 65533 -g 65533 chflags ${n1} UF_NODUMP
-expect none stat ${n1} flags
-expect 0 unlink ${n1}
-
-expect 0 mkdir ${n1} 0755
-expect EPERM -u 65534 -g 65534 chflags ${n1} UF_NODUMP
-expect none stat ${n1} flags
-expect 0 chown ${n1} 65534 65534
-expect EPERM -u 65533 -g 65533 chflags ${n1} UF_NODUMP
-expect none stat ${n1} flags
-expect 0 rmdir ${n1}
-
-expect 0 mkfifo ${n1} 0644
-expect EPERM -u 65534 -g 65534 chflags ${n1} UF_NODUMP
-expect none stat ${n1} flags
-expect 0 chown ${n1} 65534 65534
-expect EPERM -u 65533 -g 65533 chflags ${n1} UF_NODUMP
-expect none stat ${n1} flags
-expect 0 unlink ${n1}
-
-expect 0 symlink ${n2} ${n1}
-expect EPERM -u 65534 -g 65534 lchflags ${n1} UF_NODUMP
-expect none lstat ${n1} flags
-expect 0 lchown ${n1} 65534 65534
-expect EPERM -u 65533 -g 65533 lchflags ${n1} UF_NODUMP
-expect none lstat ${n1} flags
-expect 0 unlink ${n1}
+for type in regular dir fifo block char socket symlink; do
+	if [ "${type}" != "symlink" ]; then
+		create_file ${type} ${n1}
+		expect EPERM -u 65534 -g 65534 chflags ${n1} UF_NODUMP
+		expect none stat ${n1} flags
+		expect 0 chown ${n1} 65534 65534
+		expect EPERM -u 65533 -g 65533 chflags ${n1} UF_NODUMP
+		expect none stat ${n1} flags
+		if [ "${type}" = "dir" ]; then
+			expect 0 rmdir ${n1}
+		else
+			expect 0 unlink ${n1}
+		fi
+	fi
+
+	create_file ${type} ${n1}
+	expect EPERM -u 65534 -g 65534 lchflags ${n1} UF_NODUMP
+	expect none lstat ${n1} flags
+	expect 0 lchown ${n1} 65534 65534
+	expect EPERM -u 65533 -g 65533 lchflags ${n1} UF_NODUMP
+	expect none lstat ${n1} flags
+	if [ "${type}" = "dir" ]; then
+		expect 0 rmdir ${n1}
+	else
+		expect 0 unlink ${n1}
+	fi
+done
 
 cd ${cdir}
 expect 0 rmdir ${n0}

Modified: head/tools/regression/fstest/tests/chflags/08.t
==============================================================================
--- head/tools/regression/fstest/tests/chflags/08.t	Fri Aug 13 21:04:43 2010	(r211289)
+++ head/tools/regression/fstest/tests/chflags/08.t	Fri Aug 13 21:17:59 2010	(r211290)
@@ -8,7 +8,7 @@ dir=`dirname $0`
 
 require chflags
 
-echo "1..78"
+echo "1..249"
 
 n0=`namegen`
 n1=`namegen`
@@ -18,53 +18,41 @@ expect 0 mkdir ${n0} 0755
 cdir=`pwd`
 cd ${n0}
 
-expect 0 create ${n1} 0644
-expect 0 chown ${n1} 65534 65534
-for flag in SF_IMMUTABLE SF_APPEND SF_NOUNLINK; do
-	expect 0 chflags ${n1} ${flag}
-	expect EPERM -u 65533 -g 65533 chflags ${n1} UF_NODUMP
-	expect ${flag} stat ${n1} flags
-	expect EPERM -u 65534 -g 65534 chflags ${n1} UF_NODUMP
-	expect ${flag} stat ${n1} flags
+for type in regular dir fifo block char socket symlink; do
+	if [ "${type}" != "symlink" ]; then
+		create_file ${type} ${n1}
+		expect 0 chown ${n1} 65534 65534
+		for flag in SF_IMMUTABLE SF_APPEND SF_NOUNLINK; do
+			expect 0 chflags ${n1} ${flag}
+			expect EPERM -u 65533 -g 65533 chflags ${n1} UF_NODUMP
+			expect ${flag} stat ${n1} flags
+			expect EPERM -u 65534 -g 65534 chflags ${n1} UF_NODUMP
+			expect ${flag} stat ${n1} flags
+		done
+		expect 0 chflags ${n1} none
+		if [ "${type}" = "dir" ]; then
+			expect 0 rmdir ${n1}
+		else
+			expect 0 unlink ${n1}
+		fi
+	fi
+
+	create_file ${type} ${n1}
+	expect 0 lchown ${n1} 65534 65534
+	for flag in SF_IMMUTABLE SF_APPEND SF_NOUNLINK; do
+		expect 0 lchflags ${n1} ${flag}
+		expect EPERM -u 65533 -g 65533 lchflags ${n1} UF_NODUMP
+		expect ${flag} lstat ${n1} flags
+		expect EPERM -u 65534 -g 65534 lchflags ${n1} UF_NODUMP
+		expect ${flag} lstat ${n1} flags
+	done
+	expect 0 lchflags ${n1} none
+	if [ "${type}" = "dir" ]; then
+		expect 0 rmdir ${n1}
+	else
+		expect 0 unlink ${n1}
+	fi
 done
-expect 0 chflags ${n1} none
-expect 0 unlink ${n1}
-
-expect 0 mkdir ${n1} 0755
-expect 0 chown ${n1} 65534 65534
-for flag in SF_IMMUTABLE SF_APPEND SF_NOUNLINK; do
-	expect 0 chflags ${n1} ${flag}
-	expect EPERM -u 65533 -g 65533 chflags ${n1} UF_NODUMP
-	expect ${flag} stat ${n1} flags
-	expect EPERM -u 65534 -g 65534 chflags ${n1} UF_NODUMP
-	expect ${flag} stat ${n1} flags
-done
-expect 0 chflags ${n1} none
-expect 0 rmdir ${n1}
-
-expect 0 mkfifo ${n1} 0644
-expect 0 chown ${n1} 65534 65534
-for flag in SF_IMMUTABLE SF_APPEND SF_NOUNLINK; do
-	expect 0 chflags ${n1} ${flag}
-	expect EPERM -u 65533 -g 65533 chflags ${n1} UF_NODUMP
-	expect ${flag} stat ${n1} flags
-	expect EPERM -u 65534 -g 65534 chflags ${n1} UF_NODUMP
-	expect ${flag} stat ${n1} flags
-done
-expect 0 chflags ${n1} none
-expect 0 unlink ${n1}
-
-expect 0 symlink ${n2} ${n1}
-expect 0 lchown ${n1} 65534 65534
-for flag in SF_IMMUTABLE SF_APPEND SF_NOUNLINK; do
-	expect 0 lchflags ${n1} ${flag}
-	expect EPERM -u 65533 -g 65533 lchflags ${n1} UF_NODUMP
-	expect ${flag} lstat ${n1} flags
-	expect EPERM -u 65534 -g 65534 lchflags ${n1} UF_NODUMP
-	expect ${flag} lstat ${n1} flags
-done
-expect 0 lchflags ${n1} none
-expect 0 unlink ${n1}
 
 cd ${cdir}
 expect 0 rmdir ${n0}

Modified: head/tools/regression/fstest/tests/chflags/09.t
==============================================================================
--- head/tools/regression/fstest/tests/chflags/09.t	Fri Aug 13 21:04:43 2010	(r211289)
+++ head/tools/regression/fstest/tests/chflags/09.t	Fri Aug 13 21:17:59 2010	(r211290)
@@ -8,7 +8,7 @@ dir=`dirname $0`
 
 require chflags
 
-echo "1..102"
+echo "1..327"
 
 n0=`namegen`
 n1=`namegen`
@@ -21,61 +21,45 @@ expect 0 mkdir ${n0} 0755
 cdir=`pwd`
 cd ${n0}
 
-expect 0 create ${n1} 0644
-expect 0 chown ${n1} 65534 65534
-for flag in SF_IMMUTABLE SF_APPEND SF_NOUNLINK; do
-	expect 0 chflags ${n1} ${flag}
-	jexpect 1 `pwd` EPERM chflags ${n1} UF_NODUMP
-	expect ${flag} stat ${n1} flags
-	jexpect 1 `pwd` EPERM -u 65533 -g 65533 chflags ${n1} UF_NODUMP
-	expect ${flag} stat ${n1} flags
-	jexpect 1 `pwd` EPERM -u 65534 -g 65534 chflags ${n1} UF_NODUMP
-	expect ${flag} stat ${n1} flags
+for type in regular dir fifo block char socket symlink; do
+	if [ "${type}" != "symlink" ]; then
+		create_file ${type} ${n1}
+		expect 0 chown ${n1} 65534 65534
+		for flag in SF_IMMUTABLE SF_APPEND SF_NOUNLINK; do
+			expect 0 chflags ${n1} ${flag}
+			jexpect 1 `pwd` EPERM chflags ${n1} UF_NODUMP
+			expect ${flag} stat ${n1} flags
+			jexpect 1 `pwd` EPERM -u 65533 -g 65533 chflags ${n1} UF_NODUMP
+			expect ${flag} stat ${n1} flags
+			jexpect 1 `pwd` EPERM -u 65534 -g 65534 chflags ${n1} UF_NODUMP
+			expect ${flag} stat ${n1} flags
+		done
+		expect 0 chflags ${n1} none
+		if [ "${type}" = "dir" ]; then
+			expect 0 rmdir ${n1}
+		else
+			expect 0 unlink ${n1}
+		fi
+	fi
+
+	create_file ${type} ${n1}
+	expect 0 lchown ${n1} 65534 65534
+	for flag in SF_IMMUTABLE SF_APPEND SF_NOUNLINK; do
+		expect 0 lchflags ${n1} ${flag}
+		jexpect 1 `pwd` EPERM lchflags ${n1} UF_NODUMP
+		expect ${flag} lstat ${n1} flags
+		jexpect 1 `pwd` EPERM -u 65533 -g 65533 lchflags ${n1} UF_NODUMP
+		expect ${flag} lstat ${n1} flags
+		jexpect 1 `pwd` EPERM -u 65534 -g 65534 lchflags ${n1} UF_NODUMP
+		expect ${flag} lstat ${n1} flags
+	done
+	expect 0 lchflags ${n1} none
+	if [ "${type}" = "dir" ]; then
+		expect 0 rmdir ${n1}
+	else
+		expect 0 unlink ${n1}
+	fi
 done
-expect 0 chflags ${n1} none
-expect 0 unlink ${n1}
-
-expect 0 mkdir ${n1} 0755
-expect 0 chown ${n1} 65534 65534
-for flag in SF_IMMUTABLE SF_APPEND SF_NOUNLINK; do
-	expect 0 chflags ${n1} ${flag}
-	jexpect 1 `pwd` EPERM chflags ${n1} UF_NODUMP
-	expect ${flag} stat ${n1} flags
-	jexpect 1 `pwd` EPERM -u 65533 -g 65533 chflags ${n1} UF_NODUMP
-	expect ${flag} stat ${n1} flags
-	jexpect 1 `pwd` EPERM -u 65534 -g 65534 chflags ${n1} UF_NODUMP
-	expect ${flag} stat ${n1} flags
-done
-expect 0 chflags ${n1} none
-expect 0 rmdir ${n1}
-
-expect 0 mkfifo ${n1} 0644
-expect 0 chown ${n1} 65534 65534
-for flag in SF_IMMUTABLE SF_APPEND SF_NOUNLINK; do
-	expect 0 chflags ${n1} ${flag}
-	jexpect 1 `pwd` EPERM chflags ${n1} UF_NODUMP
-	expect ${flag} stat ${n1} flags
-	jexpect 1 `pwd` EPERM -u 65533 -g 65533 chflags ${n1} UF_NODUMP
-	expect ${flag} stat ${n1} flags
-	jexpect 1 `pwd` EPERM -u 65534 -g 65534 chflags ${n1} UF_NODUMP
-	expect ${flag} stat ${n1} flags
-done
-expect 0 chflags ${n1} none
-expect 0 unlink ${n1}
-
-expect 0 symlink ${n2} ${n1}
-expect 0 lchown ${n1} 65534 65534
-for flag in SF_IMMUTABLE SF_APPEND SF_NOUNLINK; do
-	expect 0 lchflags ${n1} ${flag}
-	jexpect 1 `pwd` EPERM lchflags ${n1} UF_NODUMP
-	expect ${flag} lstat ${n1} flags
-	jexpect 1 `pwd` EPERM -u 65533 -g 65533 lchflags ${n1} UF_NODUMP
-	expect ${flag} lstat ${n1} flags
-	jexpect 1 `pwd` EPERM -u 65534 -g 65534 lchflags ${n1} UF_NODUMP
-	expect ${flag} lstat ${n1} flags
-done
-expect 0 lchflags ${n1} none
-expect 0 unlink ${n1}
 
 sysctl security.jail.chflags_allowed=${old} >/dev/null
 cd ${cdir}