Module Name: src
Committed By: jmmv
Date: Tue Feb 19 15:30:07 UTC 2013
Modified Files:
src/tests: Makefile
Removed Files:
src/tests: Atffile
Log Message:
Auto-generate the top-level Atffile.
This fixes a problem in MKKYUA=no builds in which the kyua-testers
subdirectory in /usr/tests was created unconditionally and atf-run was
confused because such subdirectory didn't have an Atffile of its own.
(Due to the way our directory creation and file lists work, I'm not
sure it's possible to just not "install" the empty directory. But
that'd be an alternative to this.)
Auto-generating the Atffile causes it to only list the subdirectories
listed by the Makefile, which can vary depending on various MK* options.
Problem found by martin@.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r0 src/tests/Atffile
cvs rdiff -u -r1.40 -r1.41 src/tests/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/Makefile
diff -u src/tests/Makefile:1.40 src/tests/Makefile:1.41
--- src/tests/Makefile:1.40 Sat Feb 16 12:44:26 2013
+++ src/tests/Makefile Tue Feb 19 15:30:07 2013
@@ -1,33 +1,40 @@
-# $NetBSD: Makefile,v 1.40 2013/02/16 12:44:26 jmmv Exp $
+# $NetBSD: Makefile,v 1.41 2013/02/19 15:30:07 jmmv Exp $
.include <bsd.own.mk>
.if ${MKATF} != "no"
TESTSDIR= ${TESTSBASE}
-ATFFILE= yes
-SUBDIR= bin dev games include kernel lib libexec net
-SUBDIR+= sbin sys usr.bin usr.sbin
+TESTS_SUBDIRS= bin dev games include kernel lib libexec net
+TESTS_SUBDIRS+= sbin sys usr.bin usr.sbin
. if (${MKRUMP} != "no")
-SUBDIR+= fs rump
+TESTS_SUBDIRS+= fs rump
. if ${MKKMOD} != "no"
-SUBDIR+= modules
+TESTS_SUBDIRS+= modules
. endif
. endif
. if ${MKCRYPTO} != "no"
-SUBDIR+= crypto
+TESTS_SUBDIRS+= crypto
. endif
. if ${MKIPFILTER} != "no"
-SUBDIR+= ipf
+TESTS_SUBDIRS+= ipf
. endif
. if ${MKSHARE} != "no"
-SUBDIR+= share
+TESTS_SUBDIRS+= share
+. endif
+
+. if ${MKATF} != "no"
+ATFFILE_EXTRA_TPS+= atf
+. endif
+
+. if ${MKKYUA} != "no"
+ATFFILE_EXTRA_TPS+= kyua-testers
. endif
.include <bsd.test.mk>
