From owner-svn-src-head@FreeBSD.ORG  Wed Aug 18 22:06:44 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 5F8E0106564A;
	Wed, 18 Aug 2010 22:06:44 +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 4CC0A8FC0A;
	Wed, 18 Aug 2010 22:06:44 +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 o7IM6iDB081865;
	Wed, 18 Aug 2010 22:06:44 GMT (envelope-from pjd@svn.freebsd.org)
Received: (from pjd@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7IM6ibp081849;
	Wed, 18 Aug 2010 22:06:44 GMT (envelope-from pjd@svn.freebsd.org)
Message-Id: <201008182206.o7IM6ibp081849@svn.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Wed, 18 Aug 2010 22:06:44 +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: r211474 - in head/tools/regression/pjdfstest/tests:
	chflags chmod chown link mkdir mkfifo mknod open rename rmdir
	symlink
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, 18 Aug 2010 22:06:44 -0000

Author: pjd
Date: Wed Aug 18 22:06:43 2010
New Revision: 211474
URL: http://svn.freebsd.org/changeset/base/211474

Log:
  More tests.

Modified:
  head/tools/regression/pjdfstest/tests/chflags/01.t
  head/tools/regression/pjdfstest/tests/chmod/01.t
  head/tools/regression/pjdfstest/tests/chmod/06.t
  head/tools/regression/pjdfstest/tests/chown/01.t
  head/tools/regression/pjdfstest/tests/link/01.t
  head/tools/regression/pjdfstest/tests/link/10.t
  head/tools/regression/pjdfstest/tests/mkdir/01.t
  head/tools/regression/pjdfstest/tests/mkfifo/01.t
  head/tools/regression/pjdfstest/tests/mkfifo/09.t
  head/tools/regression/pjdfstest/tests/mknod/01.t
  head/tools/regression/pjdfstest/tests/mknod/08.t
  head/tools/regression/pjdfstest/tests/open/01.t
  head/tools/regression/pjdfstest/tests/rename/12.t
  head/tools/regression/pjdfstest/tests/rmdir/06.t
  head/tools/regression/pjdfstest/tests/symlink/08.t

Modified: head/tools/regression/pjdfstest/tests/chflags/01.t
==============================================================================
--- head/tools/regression/pjdfstest/tests/chflags/01.t	Wed Aug 18 21:51:05 2010	(r211473)
+++ head/tools/regression/pjdfstest/tests/chflags/01.t	Wed Aug 18 22:06:43 2010	(r211474)
@@ -8,13 +8,15 @@ dir=`dirname $0`
 
 require chflags
 
-echo "1..5"
+echo "1..17"
 
 n0=`namegen`
 n1=`namegen`
 
 expect 0 mkdir ${n0} 0755
-expect 0 create ${n0}/${n1} 0644
-expect ENOTDIR chflags ${n0}/${n1}/test SF_IMMUTABLE
-expect 0 unlink ${n0}/${n1}
+for type in regular fifo block char socket; do
+	create_file ${type} ${n0}/${n1}
+	expect ENOTDIR chflags ${n0}/${n1}/test SF_IMMUTABLE
+	expect 0 unlink ${n0}/${n1}
+done
 expect 0 rmdir ${n0}

Modified: head/tools/regression/pjdfstest/tests/chmod/01.t
==============================================================================
--- head/tools/regression/pjdfstest/tests/chmod/01.t	Wed Aug 18 21:51:05 2010	(r211473)
+++ head/tools/regression/pjdfstest/tests/chmod/01.t	Wed Aug 18 22:06:43 2010	(r211474)
@@ -6,13 +6,15 @@ desc="chmod returns ENOTDIR if a compone
 dir=`dirname $0`
 . ${dir}/../misc.sh
 
-echo "1..5"
+echo "1..17"
 
 n0=`namegen`
 n1=`namegen`
 
 expect 0 mkdir ${n0} 0755
-expect 0 create ${n0}/${n1} 0644
-expect ENOTDIR chmod ${n0}/${n1}/test 0644
-expect 0 unlink ${n0}/${n1}
+for type in regular fifo block char socket; do
+	create_file ${type} ${n0}/${n1}
+	expect ENOTDIR chmod ${n0}/${n1}/test 0644
+	expect 0 unlink ${n0}/${n1}
+done
 expect 0 rmdir ${n0}

Modified: head/tools/regression/pjdfstest/tests/chmod/06.t
==============================================================================
--- head/tools/regression/pjdfstest/tests/chmod/06.t	Wed Aug 18 21:51:05 2010	(r211473)
+++ head/tools/regression/pjdfstest/tests/chmod/06.t	Wed Aug 18 22:06:43 2010	(r211474)
@@ -7,9 +7,9 @@ dir=`dirname $0`
 . ${dir}/../misc.sh
 
 if supported lchmod; then
-	echo "1..8"
+	echo "1..10"
 else
-	echo "1..6"
+	echo "1..8"
 fi
 
 n0=`namegen`
@@ -17,6 +17,8 @@ n1=`namegen`
 
 expect 0 symlink ${n0} ${n1}
 expect 0 symlink ${n1} ${n0}
+expect ELOOP chmod ${n0} 0644
+expect ELOOP chmod ${n1} 0644
 expect ELOOP chmod ${n0}/test 0644
 expect ELOOP chmod ${n1}/test 0644
 if supported lchmod; then

Modified: head/tools/regression/pjdfstest/tests/chown/01.t
==============================================================================
--- head/tools/regression/pjdfstest/tests/chown/01.t	Wed Aug 18 21:51:05 2010	(r211473)
+++ head/tools/regression/pjdfstest/tests/chown/01.t	Wed Aug 18 22:06:43 2010	(r211474)
@@ -6,14 +6,16 @@ desc="chown returns ENOTDIR if a compone
 dir=`dirname $0`
 . ${dir}/../misc.sh
 
-echo "1..6"
+echo "1..22"
 
 n0=`namegen`
 n1=`namegen`
 
 expect 0 mkdir ${n0} 0755
-expect 0 create ${n0}/${n1} 0644
-expect ENOTDIR chown ${n0}/${n1}/test 65534 65534
-expect ENOTDIR lchown ${n0}/${n1}/test 65534 65534
-expect 0 unlink ${n0}/${n1}
+for type in regular fifo block char socket; do
+	create_file ${type} ${n0}/${n1}
+	expect ENOTDIR chown ${n0}/${n1}/test 65534 65534
+	expect ENOTDIR lchown ${n0}/${n1}/test 65534 65534
+	expect 0 unlink ${n0}/${n1}
+done
 expect 0 rmdir ${n0}

Modified: head/tools/regression/pjdfstest/tests/link/01.t
==============================================================================
--- head/tools/regression/pjdfstest/tests/link/01.t	Wed Aug 18 21:51:05 2010	(r211473)
+++ head/tools/regression/pjdfstest/tests/link/01.t	Wed Aug 18 22:06:43 2010	(r211474)
@@ -6,17 +6,19 @@ desc="link returns ENOTDIR if a componen
 dir=`dirname $0`
 . ${dir}/../misc.sh
 
-echo "1..8"
+echo "1..32"
 
 n0=`namegen`
 n1=`namegen`
 n2=`namegen`
 
 expect 0 mkdir ${n0} 0755
-expect 0 create ${n0}/${n1} 0644
-expect ENOTDIR link ${n0}/${n1}/test ${n0}/${n2}
-expect 0 create ${n0}/${n2} 0644
-expect ENOTDIR link ${n0}/${n2} ${n0}/${n1}/test
-expect 0 unlink ${n0}/${n1}
-expect 0 unlink ${n0}/${n2}
+for type in regular fifo block char socket; do
+	create_file ${type} ${n0}/${n1}
+	expect ENOTDIR link ${n0}/${n1}/test ${n0}/${n2}
+	create_file ${type} ${n0}/${n2}
+	expect ENOTDIR link ${n0}/${n2} ${n0}/${n1}/test
+	expect 0 unlink ${n0}/${n1}
+	expect 0 unlink ${n0}/${n2}
+done
 expect 0 rmdir ${n0}

Modified: head/tools/regression/pjdfstest/tests/link/10.t
==============================================================================
--- head/tools/regression/pjdfstest/tests/link/10.t	Wed Aug 18 21:51:05 2010	(r211473)
+++ head/tools/regression/pjdfstest/tests/link/10.t	Wed Aug 18 22:06:43 2010	(r211474)
@@ -6,27 +6,21 @@ desc="link returns EEXIST if the destina
 dir=`dirname $0`
 . ${dir}/../misc.sh
 
-echo "1..14"
+echo "1..23"
 
 n0=`namegen`
 n1=`namegen`
 
 expect 0 create ${n0} 0644
 
-expect 0 create ${n1} 0644
-expect EEXIST link ${n0} ${n1}
-expect 0 unlink ${n1}
-
-expect 0 mkdir ${n1} 0755
-expect EEXIST link ${n0} ${n1}
-expect 0 rmdir ${n1}
-
-expect 0 symlink test ${n1}
-expect EEXIST link ${n0} ${n1}
-expect 0 unlink ${n1}
-
-expect 0 mkfifo ${n1} 0644
-expect EEXIST link ${n0} ${n1}
-expect 0 unlink ${n1}
+for type in regular dir fifo block char socket symlink; do
+	create_file ${type} ${n1}
+	expect EEXIST link ${n0} ${n1}
+	if [ "${type}" = "dir" ]; then
+		expect 0 rmdir ${n1}
+	else
+		expect 0 unlink ${n1}
+	fi
+done
 
 expect 0 unlink ${n0}

Modified: head/tools/regression/pjdfstest/tests/mkdir/01.t
==============================================================================
--- head/tools/regression/pjdfstest/tests/mkdir/01.t	Wed Aug 18 21:51:05 2010	(r211473)
+++ head/tools/regression/pjdfstest/tests/mkdir/01.t	Wed Aug 18 22:06:43 2010	(r211474)
@@ -6,13 +6,15 @@ desc="mkdir returns ENOTDIR if a compone
 dir=`dirname $0`
 . ${dir}/../misc.sh
 
-echo "1..5"
+echo "1..17"
 
 n0=`namegen`
 n1=`namegen`
 
 expect 0 mkdir ${n0} 0755
-expect 0 create ${n0}/${n1} 0644
-expect ENOTDIR mkdir ${n0}/${n1}/test 0755
-expect 0 unlink ${n0}/${n1}
+for type in regular fifo block char socket; do
+	create_file ${type} ${n0}/${n1}
+	expect ENOTDIR mkdir ${n0}/${n1}/test 0755
+	expect 0 unlink ${n0}/${n1}
+done
 expect 0 rmdir ${n0}

Modified: head/tools/regression/pjdfstest/tests/mkfifo/01.t
==============================================================================
--- head/tools/regression/pjdfstest/tests/mkfifo/01.t	Wed Aug 18 21:51:05 2010	(r211473)
+++ head/tools/regression/pjdfstest/tests/mkfifo/01.t	Wed Aug 18 22:06:43 2010	(r211474)
@@ -6,13 +6,15 @@ desc="mkfifo returns ENOTDIR if a compon
 dir=`dirname $0`
 . ${dir}/../misc.sh
 
-echo "1..5"
+echo "1..17"
 
 n0=`namegen`
 n1=`namegen`
 
 expect 0 mkdir ${n0} 0755
-expect 0 create ${n0}/${n1} 0644
-expect ENOTDIR mkfifo ${n0}/${n1}/test 0644
-expect 0 unlink ${n0}/${n1}
+for type in regular fifo block char socket; do
+	create_file ${type} ${n0}/${n1}
+	expect ENOTDIR mkfifo ${n0}/${n1}/test 0644
+	expect 0 unlink ${n0}/${n1}
+done
 expect 0 rmdir ${n0}

Modified: head/tools/regression/pjdfstest/tests/mkfifo/09.t
==============================================================================
--- head/tools/regression/pjdfstest/tests/mkfifo/09.t	Wed Aug 18 21:51:05 2010	(r211473)
+++ head/tools/regression/pjdfstest/tests/mkfifo/09.t	Wed Aug 18 22:06:43 2010	(r211474)
@@ -6,22 +6,16 @@ desc="mkfifo returns EEXIST if the named
 dir=`dirname $0`
 . ${dir}/../misc.sh
 
-echo "1..12"
+echo "1..21"
 
 n0=`namegen`
 
-expect 0 mkdir ${n0} 0755
-expect EEXIST mkfifo ${n0} 0644
-expect 0 rmdir ${n0}
-
-expect 0 create ${n0} 0644
-expect EEXIST mkfifo ${n0} 0644
-expect 0 unlink ${n0}
-
-expect 0 symlink test ${n0}
-expect EEXIST mkfifo ${n0} 0644
-expect 0 unlink ${n0}
-
-expect 0 mkfifo ${n0} 0644
-expect EEXIST mkfifo ${n0} 0644
-expect 0 unlink ${n0}
+for type in regular dir fifo block char socket symlink; do
+	create_file ${type} ${n0}
+	expect EEXIST mkfifo ${n0} 0644
+	if [ "${type}" = "dir" ]; then
+		expect 0 rmdir ${n0}
+	else
+		expect 0 unlink ${n0}
+	fi
+done

Modified: head/tools/regression/pjdfstest/tests/mknod/01.t
==============================================================================
--- head/tools/regression/pjdfstest/tests/mknod/01.t	Wed Aug 18 21:51:05 2010	(r211473)
+++ head/tools/regression/pjdfstest/tests/mknod/01.t	Wed Aug 18 22:06:43 2010	(r211474)
@@ -6,13 +6,17 @@ desc="mknod returns ENOTDIR if a compone
 dir=`dirname $0`
 . ${dir}/../misc.sh
 
-echo "1..5"
+echo "1..27"
 
 n0=`namegen`
 n1=`namegen`
 
 expect 0 mkdir ${n0} 0755
-expect 0 create ${n0}/${n1} 0644
-expect ENOTDIR mknod ${n0}/${n1}/test f 0644 0 0
-expect 0 unlink ${n0}/${n1}
+for type in regular fifo block char socket; do
+	create_file ${type} ${n0}/${n1}
+	expect ENOTDIR mknod ${n0}/${n1}/test b 0644 1 2
+	expect ENOTDIR mknod ${n0}/${n1}/test c 0644 1 2
+	expect ENOTDIR mknod ${n0}/${n1}/test f 0644 0 0
+	expect 0 unlink ${n0}/${n1}
+done
 expect 0 rmdir ${n0}

Modified: head/tools/regression/pjdfstest/tests/mknod/08.t
==============================================================================
--- head/tools/regression/pjdfstest/tests/mknod/08.t	Wed Aug 18 21:51:05 2010	(r211473)
+++ head/tools/regression/pjdfstest/tests/mknod/08.t	Wed Aug 18 22:06:43 2010	(r211474)
@@ -6,30 +6,18 @@ desc="mknod returns EEXIST if the named 
 dir=`dirname $0`
 . ${dir}/../misc.sh
 
-echo "1..18"
+echo "1..35"
 
 n0=`namegen`
 
-expect 0 mkdir ${n0} 0755
-expect EEXIST mknod ${n0} f 0644 0 0
-expect 0 rmdir ${n0}
-
-expect 0 create ${n0} 0644
-expect EEXIST mknod ${n0} f 0644 0 0
-expect 0 unlink ${n0}
-
-expect 0 symlink test ${n0}
-expect EEXIST mknod ${n0} f 0644 0 0
-expect 0 unlink ${n0}
-
-expect 0 mkfifo ${n0} 0644
-expect EEXIST mknod ${n0} f 0644 0 0
-expect 0 unlink ${n0}
-
-expect 0 bind ${n0}
-expect EEXIST mknod ${n0} f 0644 0 0
-expect 0 unlink ${n0}
-
-expect 0 mknod ${n0} f 0644 0 0
-expect EEXIST mknod ${n0} f 0644 0 0
-expect 0 unlink ${n0}
+for type in regular dir fifo block char socket symlink; do
+	create_file ${type} ${n0}
+	expect EEXIST mknod ${n0} b 0644 0 0
+	expect EEXIST mknod ${n0} c 0644 0 0
+	expect EEXIST mknod ${n0} f 0644 0 0
+	if [ "${type}" = "dir" ]; then
+		expect 0 rmdir ${n0}
+	else
+		expect 0 unlink ${n0}
+	fi
+done

Modified: head/tools/regression/pjdfstest/tests/open/01.t
==============================================================================
--- head/tools/regression/pjdfstest/tests/open/01.t	Wed Aug 18 21:51:05 2010	(r211473)
+++ head/tools/regression/pjdfstest/tests/open/01.t	Wed Aug 18 22:06:43 2010	(r211474)
@@ -6,13 +6,16 @@ desc="open returns ENOTDIR if a componen
 dir=`dirname $0`
 . ${dir}/../misc.sh
 
-echo "1..5"
+echo "1..22"
 
 n0=`namegen`
 n1=`namegen`
 
 expect 0 mkdir ${n0} 0755
-expect 0 create ${n0}/${n1} 0644
-expect ENOTDIR open ${n0}/${n1}/test O_CREAT 0644
-expect 0 unlink ${n0}/${n1}
+for type in regular fifo block char socket; do
+	create_file ${type} ${n0}/${n1}
+	expect ENOTDIR open ${n0}/${n1}/test O_RDONLY
+	expect ENOTDIR open ${n0}/${n1}/test O_CREAT 0644
+	expect 0 unlink ${n0}/${n1}
+done
 expect 0 rmdir ${n0}

Modified: head/tools/regression/pjdfstest/tests/rename/12.t
==============================================================================
--- head/tools/regression/pjdfstest/tests/rename/12.t	Wed Aug 18 21:51:05 2010	(r211473)
+++ head/tools/regression/pjdfstest/tests/rename/12.t	Wed Aug 18 22:06:43 2010	(r211474)
@@ -6,17 +6,19 @@ desc="rename returns ENOTDIR if a compon
 dir=`dirname $0`
 . ${dir}/../misc.sh
 
-echo "1..8"
+echo "1..32"
 
 n0=`namegen`
 n1=`namegen`
 n2=`namegen`
 
 expect 0 mkdir ${n0} 0755
-expect 0 create ${n0}/${n1} 0644
-expect ENOTDIR rename ${n0}/${n1}/test ${n0}/${n2}
-expect 0 create ${n0}/${n2} 0644
-expect ENOTDIR link ${n0}/${n2} ${n0}/${n1}/test
-expect 0 unlink ${n0}/${n1}
-expect 0 unlink ${n0}/${n2}
+for type in regular fifo block char socket; do
+	create_file ${type} ${n0}/${n1}
+	expect ENOTDIR rename ${n0}/${n1}/test ${n0}/${n2}
+	create_file ${type} ${n0}/${n2}
+	expect ENOTDIR link ${n0}/${n2} ${n0}/${n1}/test
+	expect 0 unlink ${n0}/${n1}
+	expect 0 unlink ${n0}/${n2}
+done
 expect 0 rmdir ${n0}

Modified: head/tools/regression/pjdfstest/tests/rmdir/06.t
==============================================================================
--- head/tools/regression/pjdfstest/tests/rmdir/06.t	Wed Aug 18 21:51:05 2010	(r211473)
+++ head/tools/regression/pjdfstest/tests/rmdir/06.t	Wed Aug 18 22:06:43 2010	(r211474)
@@ -6,31 +6,19 @@ desc="rmdir returns EEXIST or ENOTEMPTY 
 dir=`dirname $0`
 . ${dir}/../misc.sh
 
-echo "1..20"
+echo "1..23"
 
 n0=`namegen`
 n1=`namegen`
 
 expect 0 mkdir ${n0} 0755
-expect 0 mkdir ${n0}/${n1} 0755
-expect "EEXIST|ENOTEMPTY" rmdir ${n0}
-expect 0 rmdir ${n0}/${n1}
-expect 0 rmdir ${n0}
-
-expect 0 mkdir ${n0} 0755
-expect 0 create ${n0}/${n1} 0644
-expect "EEXIST|ENOTEMPTY" rmdir ${n0}
-expect 0 unlink ${n0}/${n1}
-expect 0 rmdir ${n0}
-
-expect 0 mkdir ${n0} 0755
-expect 0 symlink test ${n0}/${n1}
-expect "EEXIST|ENOTEMPTY" rmdir ${n0}
-expect 0 unlink ${n0}/${n1}
-expect 0 rmdir ${n0}
-
-expect 0 mkdir ${n0} 0755
-expect 0 mkfifo ${n0}/${n1} 0644
-expect "EEXIST|ENOTEMPTY" rmdir ${n0}
-expect 0 unlink ${n0}/${n1}
+for type in regular dir fifo block char socket symlink; do
+	create_file ${type} ${n0}/${n1}
+	expect "EEXIST|ENOTEMPTY" rmdir ${n0}
+	if [ "${type}" = "dir" ]; then
+		expect 0 rmdir ${n0}/${n1}
+	else
+		expect 0 unlink ${n0}/${n1}
+	fi
+done
 expect 0 rmdir ${n0}

Modified: head/tools/regression/pjdfstest/tests/symlink/08.t
==============================================================================
--- head/tools/regression/pjdfstest/tests/symlink/08.t	Wed Aug 18 21:51:05 2010	(r211473)
+++ head/tools/regression/pjdfstest/tests/symlink/08.t	Wed Aug 18 22:06:43 2010	(r211474)
@@ -6,18 +6,16 @@ desc="symlink returns EEXIST if the name
 dir=`dirname $0`
 . ${dir}/../misc.sh
 
-echo "1..9"
+echo "1..21"
 
 n0=`namegen`
 
-expect 0 create ${n0} 0644
-expect EEXIST symlink test ${n0}
-expect 0 unlink ${n0}
-
-expect 0 mkdir ${n0} 0755
-expect EEXIST symlink test ${n0}
-expect 0 rmdir ${n0}
-
-expect 0 symlink test ${n0}
-expect EEXIST symlink test ${n0}
-expect 0 unlink ${n0}
+for type in regular dir fifo block char socket symlink; do
+	create_file ${type} ${n0}
+	expect EEXIST symlink test ${n0}
+	if [ "${type}" = "dir" ]; then
+		expect 0 rmdir ${n0}
+	else
+		expect 0 unlink ${n0}
+	fi
+done