From owner-svn-src-head@FreeBSD.ORG  Wed Aug 11 17:33:34 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F04A11065769;
	Wed, 11 Aug 2010 17:33:33 +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 0BB7C8FC15;
	Wed, 11 Aug 2010 17:33:33 +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 o7BHXWlA023217;
	Wed, 11 Aug 2010 17:33:32 GMT (envelope-from pjd@svn.freebsd.org)
Received: (from pjd@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7BHXWLn023215;
	Wed, 11 Aug 2010 17:33:32 GMT (envelope-from pjd@svn.freebsd.org)
Message-Id: <201008111733.o7BHXWLn023215@svn.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Wed, 11 Aug 2010 17:33:32 +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: r211185 - head/tools/regression/fstest/tests
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 11 Aug 2010 17:33:34 -0000

Author: pjd
Date: Wed Aug 11 17:33:32 2010
New Revision: 211185
URL: http://svn.freebsd.org/changeset/base/211185

Log:
  Allow to specify uid, gid and mode for create_file().

Modified:
  head/tools/regression/fstest/tests/misc.sh

Modified: head/tools/regression/fstest/tests/misc.sh
==============================================================================
--- head/tools/regression/fstest/tests/misc.sh	Wed Aug 11 17:33:26 2010	(r211184)
+++ head/tools/regression/fstest/tests/misc.sh	Wed Aug 11 17:33:32 2010	(r211185)
@@ -175,11 +175,14 @@ require()
 	quick_exit
 }
 
+# usage:
+#	create_file <type> <name>
+#	create_file <type> <name> <mode>
+#	create_file <type> <name> <uid> <gid>
+#	create_file <type> <name> <mode> <uid> <gid>
 create_file() {
 	type="${1}"
 	name="${2}"
-	uid="${3}"
-	gid="${4}"
 
 	case "${type}" in
 	none)
@@ -207,5 +210,12 @@ create_file() {
 		expect 0 symlink test ${name}
 		;;
 	esac
-	expect 0 lchown ${name} ${uid} ${gid}
+	if [ -n "${3}" -a -n "${4}" -a -n "${5}" ]; then
+		expect 0 lchmod ${name} ${3}
+		expect 0 lchown ${name} ${4} ${5}
+	elif [ -n "${3}" -a -n "${4}" ]; then
+		expect 0 lchown ${name} ${3} ${4}
+	elif [ -n "${3}" ]; then
+		expect 0 lchmod ${name} ${3}
+	fi
 }