svn commit: r198305 - head/tools/regression/fstest/tests/rename

[Pawel Jakub Dawidek]

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 at 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