Module Name: src
Committed By: pooka
Date: Fri Jan 7 11:50:37 UTC 2011
Modified Files:
src/tests/fs/common: fstest_puffs.c
Log Message:
Don't panic if "unnecessary" dir already exists.
(helpful when running the test without atf-run)
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/tests/fs/common/fstest_puffs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/fs/common/fstest_puffs.c
diff -u src/tests/fs/common/fstest_puffs.c:1.8 src/tests/fs/common/fstest_puffs.c:1.9
--- src/tests/fs/common/fstest_puffs.c:1.8 Fri Jan 7 10:45:45 2011
+++ src/tests/fs/common/fstest_puffs.c Fri Jan 7 11:50:37 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: fstest_puffs.c,v 1.8 2011/01/07 10:45:45 pooka Exp $ */
+/* $NetBSD: fstest_puffs.c,v 1.9 2011/01/07 11:50:37 pooka Exp $ */
/*
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
@@ -360,7 +360,7 @@
rump_init();
if ((rv = ffs_fstest_newfs(tc, argp, image, size, fspriv)) != 0)
return rv;
- if (mkdir("p2kffsfake", 0777) == -1)
+ if (mkdir("p2kffsfake", 0777) == -1 && errno != EEXIST)
return errno;
setenv("P2K_NODETACH", "1", 1);
