svn commit: r211185 - head/tools/regression/fstest/tests

[Pawel Jakub Dawidek]

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
 }