Module Name:    src
Committed By:   pgoyette
Date:           Sat Aug 21 13:57:41 UTC 2010

Modified Files:
        src/tests/modules: Makefile

Log Message:
Fix botched update.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/modules/Makefile

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

Modified files:

Index: src/tests/modules/Makefile
diff -u src/tests/modules/Makefile:1.6 src/tests/modules/Makefile:1.7
--- src/tests/modules/Makefile:1.6	Sat Aug 21 13:21:48 2010
+++ src/tests/modules/Makefile	Sat Aug 21 13:57:41 2010
@@ -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>

Reply via email to