Sun Aug 1 14:50:54 2010 UTC ()
The erroneous error codes described in kern/43616 have been fixed.


(mlelstv)
diff -r1.5 -r1.6 src/tests/fs/vfs/t_vnops.c
cvs diff -r1.5 -r1.6 src/tests/fs/vfs/t_vnops.c (expand / switch to unified diff)

--- src/tests/fs/vfs/t_vnops.c 2010/07/26 13:37:48 1.5
+++ src/tests/fs/vfs/t_vnops.c 2010/08/01 14:50:54 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: t_vnops.c,v 1.5 2010/07/26 13:37:48 njoly Exp $ */ 1/* $NetBSD: t_vnops.c,v 1.6 2010/08/01 14:50:54 mlelstv Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2010 The NetBSD Foundation, Inc. 4 * Copyright (c) 2010 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -247,30 +247,26 @@ static void @@ -247,30 +247,26 @@ static void
247rename_dotdot(const atf_tc_t *tc, const char *mp) 247rename_dotdot(const atf_tc_t *tc, const char *mp)
248{ 248{
249 249
250 USES_DIRS; 250 USES_DIRS;
251 251
252 if (rump_sys_chdir(mp) == -1) 252 if (rump_sys_chdir(mp) == -1)
253 atf_tc_fail_errno("chdir mountpoint"); 253 atf_tc_fail_errno("chdir mountpoint");
254 254
255 if (rump_sys_mkdir("dir1", 0777) == -1) 255 if (rump_sys_mkdir("dir1", 0777) == -1)
256 atf_tc_fail_errno("mkdir 1"); 256 atf_tc_fail_errno("mkdir 1");
257 if (rump_sys_mkdir("dir2", 0777) == -1) 257 if (rump_sys_mkdir("dir2", 0777) == -1)
258 atf_tc_fail_errno("mkdir 2"); 258 atf_tc_fail_errno("mkdir 2");
259 259
260 /* msdosfs fails both at least currently */ 
261 if (FSTYPE_MSDOS(tc)) { 
262 atf_tc_expect_fail("PR kern/43616"); 
263 } 
264 if (rump_sys_rename("dir1", "dir1/..") != -1 || errno != EINVAL) 260 if (rump_sys_rename("dir1", "dir1/..") != -1 || errno != EINVAL)
265 atf_tc_fail_errno("self-dotdot to"); 261 atf_tc_fail_errno("self-dotdot to");
266 262
267 if (rump_sys_rename("dir1/..", "sometarget") != -1 || errno != EINVAL) 263 if (rump_sys_rename("dir1/..", "sometarget") != -1 || errno != EINVAL)
268 atf_tc_fail_errno("self-dotdot from"); 264 atf_tc_fail_errno("self-dotdot from");
269 atf_tc_expect_pass(); 265 atf_tc_expect_pass();
270 266
271 if (FSTYPE_TMPFS(tc)) { 267 if (FSTYPE_TMPFS(tc)) {
272 atf_tc_expect_fail("PR kern/43617"); 268 atf_tc_expect_fail("PR kern/43617");
273 } 269 }
274 if (rump_sys_rename("dir1", "dir2/..") != -1 || errno != EINVAL) 270 if (rump_sys_rename("dir1", "dir2/..") != -1 || errno != EINVAL)
275 atf_tc_fail("other-dotdot"); 271 atf_tc_fail("other-dotdot");
276 272