From owner-svn-src-head@FreeBSD.ORG  Tue Oct 20 21:08:32 2009
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 AB99A106566B;
	Tue, 20 Oct 2009 21:08:32 +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 9A7B58FC12;
	Tue, 20 Oct 2009 21:08:32 +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 n9KL8WRF078548;
	Tue, 20 Oct 2009 21:08:32 GMT (envelope-from pjd@svn.freebsd.org)
Received: (from pjd@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9KL8W1K078546;
	Tue, 20 Oct 2009 21:08:32 GMT (envelope-from pjd@svn.freebsd.org)
Message-Id: <200910202108.n9KL8W1K078546@svn.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Tue, 20 Oct 2009 21:08: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: r198305 - head/tools/regression/fstest/tests/rename
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: Tue, 20 Oct 2009 21:08:32 -0000

Author: pjd
Date: Tue Oct 20 21:08:32 2009
New Revision: 198305
URL: http://svn.freebsd.org/changeset/base/198305

Log:
  Fix a case where rename actually succeeds, which is also expected behaviour
  according to POSIX. This fixes ZFS on Solaris testing.
  
  Submitted by:	Milan Cermak <Milan.Cermak@Sun.COM>

Modified:
  head/tools/regression/fstest/tests/rename/21.t

Modified: head/tools/regression/fstest/tests/rename/21.t
==============================================================================
--- head/tools/regression/fstest/tests/rename/21.t	Tue Oct 20 19:05:43 2009	(r198304)
+++ head/tools/regression/fstest/tests/rename/21.t	Tue Oct 20 21:08:32 2009	(r198305)
@@ -6,7 +6,7 @@ desc="write access to subdirectory is re
 dir=`dirname $0`
 . ${dir}/../misc.sh
 
-echo "1..15"
+echo "1..16"
 
 n0=`namegen`
 n1=`namegen`
@@ -30,8 +30,9 @@ expect "0|EACCES" -u 65534 -g 65534 rena
 # to move ${n0} from ${n2} to ${n3}.
 expect "0|EACCES" -u 65534 -g 65534 rename ${n2}/${n0} ${n3}/${n1}
 
-expect 0 rmdir ${n2}/${n0}
+expect "0|ENOENT" rmdir ${n2}/${n0}
 expect ENOENT rmdir ${n2}/${n0}
+expect "0|ENOENT" rmdir ${n3}/${n1}
 expect ENOENT rmdir ${n3}/${n1}
 
 # Check that write permission on containing directory (${n2}) is enough