From owner-svn-src-head@FreeBSD.ORG  Sun Nov 23 19:58:26 2008
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 95EF3106564A;
	Sun, 23 Nov 2008 19:58:26 +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 832F88FC1A;
	Sun, 23 Nov 2008 19:58:26 +0000 (UTC) (envelope-from pjd@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id mANJwQe8062438;
	Sun, 23 Nov 2008 19:58:26 GMT (envelope-from pjd@svn.freebsd.org)
Received: (from pjd@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id mANJwQuF062437;
	Sun, 23 Nov 2008 19:58:26 GMT (envelope-from pjd@svn.freebsd.org)
Message-Id: <200811231958.mANJwQuF062437@svn.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Sun, 23 Nov 2008 19:58:26 +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: r185221 - head/tools/regression/fstest/tests/rmdir
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: Sun, 23 Nov 2008 19:58:26 -0000

Author: pjd
Date: Sun Nov 23 19:58:26 2008
New Revision: 185221
URL: http://svn.freebsd.org/changeset/base/185221

Log:
  FreeBSD's way of handling rmdir("..") is not POSIX-compilant.

Modified:
  head/tools/regression/fstest/tests/rmdir/12.t

Modified: head/tools/regression/fstest/tests/rmdir/12.t
==============================================================================
--- head/tools/regression/fstest/tests/rmdir/12.t	Sun Nov 23 19:57:16 2008	(r185220)
+++ head/tools/regression/fstest/tests/rmdir/12.t	Sun Nov 23 19:58:26 2008	(r185221)
@@ -1,7 +1,7 @@
 #!/bin/sh
 # $FreeBSD$
 
-desc="rmdir returns EINVAL if the last component of the path is '.' or '..'"
+desc="rmdir returns EINVAL if the last component of the path is '.' and EEXIST or ENOTEMPTY if the last component of the path is '..'"
 
 dir=`dirname $0`
 . ${dir}/../misc.sh
@@ -14,13 +14,7 @@ n1=`namegen`
 expect 0 mkdir ${n0} 0755
 expect 0 mkdir ${n0}/${n1} 0755
 expect EINVAL rmdir ${n0}/${n1}/.
-case "${os}" in
-FreeBSD)
-	expect EINVAL rmdir ${n0}/${n1}/..
-	;;
-*)
-	expect EEXIST rmdir ${n0}/${n1}/..
-	;;
-esac
+todo FreeBSD "According to POSIX: EEXIST or ENOTEMPTY - The path argument names a directory that is not an empty directory, or there are hard links to the directory other than dot or a single entry in dot-dot."
+expect "ENOTEMPTY|EEXIST" rmdir ${n0}/${n1}/..
 expect 0 rmdir ${n0}/${n1}
 expect 0 rmdir ${n0}