[src/trunk]: src/tests Auto-generate the top-level Atffile.

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

details:   https://anonhg.NetBSD.org/src/rev/5a12dbbe229b
branches:  trunk
changeset: 785043:5a12dbbe229b
user:      jmmv <jmmv%NetBSD.org@localhost>
date:      Tue Feb 19 15:30:07 2013 +0000

description:
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@.

diffstat:

 tests/Atffile  |   7 -------
 tests/Makefile |  25 ++++++++++++++++---------
 2 files changed, 16 insertions(+), 16 deletions(-)

diffs (64 lines):

diff -r 1a3c721ae6a4 -r 5a12dbbe229b tests/Atffile
--- a/tests/Atffile     Tue Feb 19 15:21:08 2013 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-Content-Type: application/X-atf-atffile; version="1"
-X-NetBSD-Id: "$NetBSD: Atffile,v 1.4 2007/12/30 09:13:32 jmmv Exp $"
-
-# XXX: This top-level file shouldn't have to define a test-suite.
-prop: test-suite = "NetBSD"
-
-tp-glob: *
diff -r 1a3c721ae6a4 -r 5a12dbbe229b tests/Makefile
--- a/tests/Makefile    Tue Feb 19 15:21:08 2013 +0000
+++ b/tests/Makefile    Tue Feb 19 15:30:07 2013 +0000
@@ -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>