Module Name: src
Committed By: pooka
Date: Fri Jul 30 10:23:26 UTC 2010
Modified Files:
src/tests/fs/common: fstest_nfs.c
Log Message:
Wait for child (rumpnfsd) to die before declaring unmount successful.
(yes, should be in delfs, but delfs doesn't work due to the cleanup hassle)
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/fs/common/fstest_nfs.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_nfs.c
diff -u src/tests/fs/common/fstest_nfs.c:1.1 src/tests/fs/common/fstest_nfs.c:1.2
--- src/tests/fs/common/fstest_nfs.c:1.1 Thu Jul 29 14:15:47 2010
+++ src/tests/fs/common/fstest_nfs.c Fri Jul 30 10:23:26 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: fstest_nfs.c,v 1.1 2010/07/29 14:15:47 pooka Exp $ */
+/* $NetBSD: fstest_nfs.c,v 1.2 2010/07/30 10:23:26 pooka Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -196,6 +196,7 @@
nfs_fstest_unmount(const atf_tc_t *tc, const char *path, int flags)
{
struct nfstestargs *args = theargs;
+ int status;
if (rump_sys_unmount(path, flags) == -1) {
return errno;
@@ -212,9 +213,11 @@
* to send some unmount RPCs, leading to sticky situations.
*/
kill(args->ta_childpid, SIGKILL);
+ wait(&status);
/* remove ethernet bus */
- unlink(args->ta_ethername);
+ if (unlink(args->ta_ethername) == -1)
+ atf_tc_fail_errno("unlink ethername");
return 0;
}
