summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorpjd <pjd@FreeBSD.org>2009-10-20 21:08:32 +0000
committerpjd <pjd@FreeBSD.org>2009-10-20 21:08:32 +0000
commitd07399d06adff699d4d6eefecba79ce65c327048 (patch)
tree82d74b7a6cdecfac9925706852a038fb29842e9c /tools
parent7b2639cc555d10e43a62957bdf2ef77432965f3f (diff)
downloadFreeBSD-src-d07399d06adff699d4d6eefecba79ce65c327048.zip
FreeBSD-src-d07399d06adff699d4d6eefecba79ce65c327048.tar.gz
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>
Diffstat (limited to 'tools')
-rw-r--r--tools/regression/fstest/tests/rename/21.t5
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/regression/fstest/tests/rename/21.t b/tools/regression/fstest/tests/rename/21.t
index 4469745..2630f62 100644
--- a/tools/regression/fstest/tests/rename/21.t
+++ b/tools/regression/fstest/tests/rename/21.t
@@ -6,7 +6,7 @@ desc="write access to subdirectory is required to move it to another directory"
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 rename ${n2}/${n1} ${n2}/${n0}
# 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
OpenPOWER on IntegriCloud