[src/trunk]: src/tests/modules Fix botched update.

[pgoyette <pgoyette%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8566f5abc280
branches:  trunk
changeset: 757257:8566f5abc280
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Sat Aug 21 13:57:41 2010 +0000

description:
Fix botched update.

diffstat:

 tests/modules/Makefile |  20 +++++++++++++-------
 1 files changed, 13 insertions(+), 7 deletions(-)

diffs (31 lines):

diff -r be7d42c00829 -r 8566f5abc280 tests/modules/Makefile
--- a/tests/modules/Makefile    Sat Aug 21 13:47:37 2010 +0000
+++ b/tests/modules/Makefile    Sat Aug 21 13:57:41 2010 +0000
@@ -1,14 +1,20 @@
-#      $NetBSD: Makefile,v 1.6 2010/08/21 13:21:48 pgoyette Exp $
+# $NetBSD: Makefile,v 1.7 2010/08/21 13:57:41 pgoyette Exp $
 
 .include <bsd.own.mk>
 
-KMOD=          k_helper2
-KMODULEDIR=    ${DESTDIR}/${TESTSBASE}/modules/${KMOD}
+TESTSDIR=      ${TESTSBASE}/modules
 
-SRCS=          k_helper2.c
+# Ideally this test could be in the parent Makefile, which could not descend
+# into this directory at all.  Unfortunately, the etc/mtree/NetBSD.dist file
+# creates the 'modules' subdirectory unconditionally, which if left empty
+# will confuse atf-run.  Therefore we must install, at the very least, the
+# Atffile into it.
+TESTS_C=       t_modctl
+LDADD=         -lprop
 
-ATFFILE=       no
-NOMAN=         # defined
+TESTS_SH=      t_modload
+
+SUBDIR=                k_helper
+SUBDIR+=       k_helper2
 
 .include <bsd.test.mk>
-.include <bsd.kmodule.mk>