Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/tests/modules/t_modload.sh,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- src/tests/modules/t_modload.sh	2010/11/07 17:51:20	1.8
+++ src/tests/modules/t_modload.sh	2011/03/24 21:52:51	1.9
@@ -1,4 +1,4 @@
-# $NetBSD: t_modload.sh,v 1.8 2010/11/07 17:51:20 jmmv Exp $
+# $NetBSD: t_modload.sh,v 1.9 2011/03/24 21:52:51 jmmv Exp $
 #
 # Copyright (c) 2008 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -47,9 +47,10 @@ EOF
 	check_sysctl vendor.k_helper.prop_int_ok 0
 	check_sysctl vendor.k_helper.prop_str_ok 0
 	atf_check -s eq:0 -o empty -e empty modunload k_helper
+	touch done
 }
 plain_cleanup() {
-	modunload k_helper >/dev/null 2>&1
+	test -f done || modunload k_helper >/dev/null 2>&1
 }
 
 atf_test_case bflag cleanup
@@ -89,7 +90,7 @@ bflag_body() {
 	#echo "Checking valid values"
 }
 bflag_cleanup() {
-	modunload k_helper >/dev/null 2>&1
+	modunload k_helper >/dev/null 2>&1 || true
 }
 
 atf_test_case iflag cleanup
@@ -130,9 +131,10 @@ iflag_body() {
 		check_sysctl vendor.k_helper.prop_int_val "${v}"
 		atf_check -s eq:0 -o empty -e empty modunload k_helper
 	done
+	touch done
 }
 iflag_cleanup() {
-	modunload k_helper >/dev/null 2>&1
+	test -f done || modunload k_helper >/dev/null 2>&1
 }
 
 atf_test_case sflag cleanup
@@ -158,9 +160,10 @@ sflag_body() {
 		check_sysctl vendor.k_helper.prop_str_val "${v}"
 		atf_check -s eq:0 -o empty -e empty modunload k_helper
 	done
+	touch done
 }
 sflag_cleanup() {
-	modunload k_helper >/dev/null 2>&1
+	test -f done || modunload k_helper >/dev/null 2>&1
 }
 
 atf_init_test_cases()