Re: useless /usr/tests tree for MKATF=no builds

[Nicolas Joly <njoly%pasteur.fr@localhost>]

On Mon, Nov 29, 2010 at 09:03:39PM +0100, Nicolas Joly wrote:
> 
> Unless we plan to integrate stuff that will not use ATF, i'm currently
> thinking of making tests set optional.
> 
> This will require a new mtree list (etc/mtree/NetBSD.dist.tests), a
> new variable `test' in distrib/sets/sets.subr to allow generating the
> corresponding `tests.tgz' archive. And maybe some other adjustements
> somewhere ...

Attached, the patch i'm currently testing and plan to commit in a few
days if no problems occurs.

-- 
Nicolas Joly

Biological Software and Databanks.
Institut Pasteur, Paris.

Index: tests/Makefile
===================================================================
RCS file: /cvsroot/src/tests/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- tests/Makefile      30 Nov 2010 23:17:27 -0000      1.24
+++ tests/Makefile      2 Dec 2010 08:07:12 -0000
@@ -2,19 +2,19 @@
 
 .include <bsd.own.mk>
 
+.if ${MKATF} != "no"
+
 TESTSDIR=      ${TESTSBASE}
 ATFFILE=       yes
 
-SUBDIR=        crypto games ipf util
-  
-.if ${MKATF} != "no"
-SUBDIR+= dev fs include kernel lib libexec net rump sbin sys syscall
+SUBDIR=                crypto dev fs games include ipf kernel lib libexec net
+SUBDIR+=       rump sbin sys syscall util
 
 . if ${MACHINE} != "evbppc" && ${MKKMOD} != "no"
 SUBDIR+= modules
 . endif
 
+.include <bsd.test.mk>
 .endif
 
-.include <bsd.test.mk>
 .include <bsd.subdir.mk>
Index: distrib/sets/sets.subr
===================================================================
RCS file: /cvsroot/src/distrib/sets/sets.subr,v
retrieving revision 1.124
diff -u -p -r1.124 sets.subr
--- distrib/sets/sets.subr      19 Jun 2010 03:50:30 -0000      1.124
+++ distrib/sets/sets.subr      2 Dec 2010 08:07:12 -0000
@@ -131,10 +131,17 @@ MKVARS="$( ${MAKE} -B -f ${rundir}/mkvar
 
 setsdir=${rundir}
 obsolete=0
-module=yes
 if [ "${MKKMOD}" = "no" ]; then
        module=no                       # MODULEs are off.
-       kmod=no
+       modset=""
+else
+       module=yes
+       modset="modules"
+fi
+if [ "${MKATF}" = "no" ]; then
+       testset=""
+else
+       testset="tests"
 fi
 # Determine lib type. Do this first so stlib also gets set.
 if [ "${OBJECT_FMT}" = "ELF" ]; then
@@ -147,11 +154,7 @@ stlib=$shlib
 if [ "${MKPIC}" = "no" ]; then
        shlib=no
 fi
-if [ "$module" != "no" ]; then
-       nlists="base comp etc games man misc modules tests text"
-else
-       nlists="base comp etc games man misc tests text"
-fi
+nlists="base comp etc games man misc $modset $testset text"
 xlists="xbase xcomp xetc xfont xserver"
 extlists="extbase extcomp extetc"
 
@@ -188,6 +191,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
 #      obsolete                file is obsolete, and only printed if 
 #                              ${obsolete} != 0
 #
+#      atf                     ${MKATF} != no
 #      bfd                     obsolete, use binutils.
 #      binutils                ${MKBINUTILS} != no
 #      catpages                ${MKCATPAGES} != no
Index: etc/mtree/Makefile
===================================================================
RCS file: /cvsroot/src/etc/mtree/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- etc/mtree/Makefile  27 Apr 2010 03:01:25 -0000      1.17
+++ etc/mtree/Makefile  2 Dec 2010 08:07:16 -0000
@@ -14,6 +14,10 @@ EXTRA_DIST_FILES=    ${.CURDIR}/NetBSD.dist
 EXTRA_DIST_FILES+=     ${.CURDIR}/NetBSD.dist.${MACHINE_ARCH}
 .endif
 
+.if ${MKATF} != "no"
+EXTRA_DIST_FILES+=     ${.CURDIR}/NetBSD.dist.tests
+.endif
+
 .if ${MKEXTSRC} != "no"
 EXTRA_DIST_FILES+=     ${.CURDIR}/NetBSD.dist.extsrc
 .endif
Index: etc/mtree/NetBSD.dist.base
===================================================================
RCS file: /cvsroot/src/etc/mtree/NetBSD.dist.base,v
retrieving revision 1.65
diff -u -p -r1.65 NetBSD.dist.base
--- etc/mtree/NetBSD.dist.base  1 Dec 2010 07:03:21 -0000       1.65
+++ etc/mtree/NetBSD.dist.base  2 Dec 2010 08:07:17 -0000
@@ -194,92 +194,6 @@
 ./usr/libdata/debug/usr/libexec/postfix
 ./usr/libdata/debug/usr/mdec
 ./usr/libdata/debug/usr/sbin
-./usr/libdata/debug/usr/tests
-./usr/libdata/debug/usr/tests/atf
-./usr/libdata/debug/usr/tests/atf/atf-c
-./usr/libdata/debug/usr/tests/atf/atf-c/detail
-./usr/libdata/debug/usr/tests/atf/atf-c++
-./usr/libdata/debug/usr/tests/atf/atf-c++/detail
-./usr/libdata/debug/usr/tests/atf/atf-report
-./usr/libdata/debug/usr/tests/atf/atf-run
-./usr/libdata/debug/usr/tests/atf/formats
-./usr/libdata/debug/usr/tests/atf/test-programs
-./usr/libdata/debug/usr/tests/crypto
-./usr/libdata/debug/usr/tests/crypto/libcrypto
-./usr/libdata/debug/usr/tests/dev
-./usr/libdata/debug/usr/tests/dev/audio
-./usr/libdata/debug/usr/tests/dev/cgd
-./usr/libdata/debug/usr/tests/dev/cgd/h_img2cgd
-./usr/libdata/debug/usr/tests/dev/md
-./usr/libdata/debug/usr/tests/dev/scsipi
-./usr/libdata/debug/usr/tests/dev/sysmon
-./usr/libdata/debug/usr/tests/fs
-./usr/libdata/debug/usr/tests/fs/ffs
-./usr/libdata/debug/usr/tests/fs/kernfs
-./usr/libdata/debug/usr/tests/fs/lfs
-./usr/libdata/debug/usr/tests/fs/msdosfs
-./usr/libdata/debug/usr/tests/fs/nfs
-./usr/libdata/debug/usr/tests/fs/nfs/nfsservice
-./usr/libdata/debug/usr/tests/fs/nullfs
-./usr/libdata/debug/usr/tests/fs/psshfs
-./usr/libdata/debug/usr/tests/fs/ptyfs
-./usr/libdata/debug/usr/tests/fs/puffs
-./usr/libdata/debug/usr/tests/fs/puffs/h_dtfs
-./usr/libdata/debug/usr/tests/fs/tmpfs
-./usr/libdata/debug/usr/tests/fs/umapfs
-./usr/libdata/debug/usr/tests/fs/union
-./usr/libdata/debug/usr/tests/fs/vfs
-./usr/libdata/debug/usr/tests/include
-./usr/libdata/debug/usr/tests/include/sys
-./usr/libdata/debug/usr/tests/ipf
-./usr/libdata/debug/usr/tests/kernel
-./usr/libdata/debug/usr/tests/kernel/kqueue
-./usr/libdata/debug/usr/tests/kernel/kqueue/read
-./usr/libdata/debug/usr/tests/kernel/kqueue/write
-./usr/libdata/debug/usr/tests/kernel/tty
-./usr/libdata/debug/usr/tests/lib
-./usr/libdata/debug/usr/tests/lib/csu
-./usr/libdata/debug/usr/tests/lib/libc
-./usr/libdata/debug/usr/tests/lib/libc/gen
-./usr/libdata/debug/usr/tests/lib/libc/hash
-./usr/libdata/debug/usr/tests/lib/libc/stdio
-./usr/libdata/debug/usr/tests/lib/libc/stdlib
-./usr/libdata/debug/usr/tests/lib/libdes
-./usr/libdata/debug/usr/tests/lib/libevent
-./usr/libdata/debug/usr/tests/lib/semaphore
-./usr/libdata/debug/usr/tests/lib/semaphore/pthread
-./usr/libdata/debug/usr/tests/lib/libobjc
-./usr/libdata/debug/usr/tests/lib/libposix
-./usr/libdata/debug/usr/tests/lib/libposix/bsd
-./usr/libdata/debug/usr/tests/lib/libposix/posix1
-./usr/libdata/debug/usr/tests/lib/libposix/posix2
-./usr/libdata/debug/usr/tests/lib/libprop
-./usr/libdata/debug/usr/tests/lib/libpthread
-./usr/libdata/debug/usr/tests/lib/librt
-./usr/libdata/debug/usr/tests/lib/libskey
-./usr/libdata/debug/usr/tests/lib/libutil
-./usr/libdata/debug/usr/tests/libexec
-./usr/libdata/debug/usr/tests/libexec/ld.elf_so
-./usr/libdata/debug/usr/tests/modules
-./usr/libdata/debug/usr/tests/net
-./usr/libdata/debug/usr/tests/net/bpf
-./usr/libdata/debug/usr/tests/net/carp
-./usr/libdata/debug/usr/tests/net/icmp
-./usr/libdata/debug/usr/tests/net/if
-./usr/libdata/debug/usr/tests/net/if_loop
-./usr/libdata/debug/usr/tests/net/sys
-./usr/libdata/debug/usr/tests/rump
-./usr/libdata/debug/usr/tests/rump/modautoload
-./usr/libdata/debug/usr/tests/rump/rumpkern
-./usr/libdata/debug/usr/tests/rump/rumpkern/h_client
-./usr/libdata/debug/usr/tests/rump/rumpkern/h_server
-./usr/libdata/debug/usr/tests/rump/rumpvfs
-./usr/libdata/debug/usr/tests/sbin
-./usr/libdata/debug/usr/tests/sbin/resize_ffs
-./usr/libdata/debug/usr/tests/syscall
-./usr/libdata/debug/usr/tests/util
-./usr/libdata/debug/usr/tests/util/df
-./usr/libdata/debug/usr/tests/util/id
 ./usr/libdata/firmware
 ./usr/libdata/firmware/radeon
 ./usr/libdata/ldscripts
@@ -1137,118 +1051,6 @@
 ./usr/share/zoneinfo/Mideast
 ./usr/share/zoneinfo/Pacific
 ./usr/share/zoneinfo/US
-./usr/tests
-./usr/tests/atf
-./usr/tests/atf/atf-c
-./usr/tests/atf/atf-c/detail
-./usr/tests/atf/atf-c++
-./usr/tests/atf/atf-c++/detail
-./usr/tests/atf/atf-config
-./usr/tests/atf/atf-report
-./usr/tests/atf/atf-run
-./usr/tests/atf/atf-sh
-./usr/tests/atf/test-programs
-./usr/tests/crypto
-./usr/tests/crypto/libcrypto
-./usr/tests/dev
-./usr/tests/dev/audio
-./usr/tests/dev/cgd
-./usr/tests/dev/cgd/h_img2cgd
-./usr/tests/dev/md
-./usr/tests/dev/scsipi
-./usr/tests/dev/sysmon
-./usr/tests/fs
-./usr/tests/fs/ffs
-./usr/tests/fs/kernfs
-./usr/tests/fs/lfs
-./usr/tests/fs/msdosfs
-./usr/tests/fs/nfs
-./usr/tests/fs/nfs/nfsservice
-./usr/tests/fs/nullfs
-./usr/tests/fs/psshfs
-./usr/tests/fs/ptyfs
-./usr/tests/fs/puffs
-./usr/tests/fs/puffs/h_dtfs
-./usr/tests/fs/tmpfs
-./usr/tests/fs/umapfs
-./usr/tests/fs/union
-./usr/tests/fs/vfs
-./usr/tests/games
-./usr/tests/include
-./usr/tests/include/sys
-./usr/tests/ipf
-./usr/tests/ipf/expected
-./usr/tests/ipf/input
-./usr/tests/ipf/regress
-./usr/tests/kernel
-./usr/tests/kernel/kqueue
-./usr/tests/kernel/kqueue/read
-./usr/tests/kernel/kqueue/write
-./usr/tests/kernel/tty
-./usr/tests/lib
-./usr/tests/lib/csu
-./usr/tests/lib/libc
-./usr/tests/lib/libc/gen
-./usr/tests/lib/libc/hash
-./usr/tests/lib/libc/stdio
-./usr/tests/lib/libc/stdlib
-./usr/tests/lib/libdes
-./usr/tests/lib/semaphore
-./usr/tests/lib/semaphore/pthread
-./usr/tests/lib/libevent
-./usr/tests/lib/libobjc
-./usr/tests/lib/libposix
-./usr/tests/lib/libposix/bsd
-./usr/tests/lib/libposix/posix1
-./usr/tests/lib/libposix/posix2
-./usr/tests/lib/libprop
-./usr/tests/lib/libpthread
-./usr/tests/lib/librt
-./usr/tests/lib/libskey
-./usr/tests/lib/libutil
-./usr/tests/libexec
-./usr/tests/libexec/ld.elf_so
-./usr/tests/modules
-./usr/tests/net
-./usr/tests/net/bpf
-./usr/tests/net/carp
-./usr/tests/net/icmp
-./usr/tests/net/if
-./usr/tests/net/if_loop
-./usr/tests/net/sys
-./usr/tests/rump
-./usr/tests/rump/modautoload
-./usr/tests/rump/rumpkern
-./usr/tests/rump/rumpkern/h_client
-./usr/tests/rump/rumpkern/h_server
-./usr/tests/rump/rumpvfs
-./usr/tests/sbin
-./usr/tests/sbin/resize_ffs
-./usr/tests/sys
-./usr/tests/sys/rc
-./usr/tests/syscall
-./usr/tests/util
-./usr/tests/util/awk
-./usr/tests/util/bzip2
-./usr/tests/util/config
-./usr/tests/util/config/support
-./usr/tests/util/config/support/arch
-./usr/tests/util/config/support/arch/regress
-./usr/tests/util/config/support/arch/regress/conf
-./usr/tests/util/config/support/conf
-./usr/tests/util/cut
-./usr/tests/util/df
-./usr/tests/util/grep
-./usr/tests/util/id
-./usr/tests/util/m4
-./usr/tests/util/make
-./usr/tests/util/mtree
-./usr/tests/util/ps
-./usr/tests/util/sdiff
-./usr/tests/util/sh
-./usr/tests/util/sort
-./usr/tests/util/xlint
-./usr/tests/util/xlint/lint1
 ./var
 ./var/account
 ./var/at
Index: etc/mtree/NetBSD.dist.tests
===================================================================
RCS file: etc/mtree/NetBSD.dist.tests
diff -N etc/mtree/NetBSD.dist.tests
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ etc/mtree/NetBSD.dist.tests 2 Dec 2010 08:07:17 -0000
@@ -0,0 +1,200 @@
+#      $NetBSD$
+
+./usr/libdata/debug/usr/tests
+./usr/libdata/debug/usr/tests/atf
+./usr/libdata/debug/usr/tests/atf/atf-c
+./usr/libdata/debug/usr/tests/atf/atf-c/detail
+./usr/libdata/debug/usr/tests/atf/atf-c++
+./usr/libdata/debug/usr/tests/atf/atf-c++/detail
+./usr/libdata/debug/usr/tests/atf/atf-report
+./usr/libdata/debug/usr/tests/atf/atf-run
+./usr/libdata/debug/usr/tests/atf/formats
+./usr/libdata/debug/usr/tests/atf/test-programs
+./usr/libdata/debug/usr/tests/crypto
+./usr/libdata/debug/usr/tests/crypto/libcrypto
+./usr/libdata/debug/usr/tests/dev
+./usr/libdata/debug/usr/tests/dev/audio
+./usr/libdata/debug/usr/tests/dev/cgd
+./usr/libdata/debug/usr/tests/dev/cgd/h_img2cgd
+./usr/libdata/debug/usr/tests/dev/md
+./usr/libdata/debug/usr/tests/dev/scsipi
+./usr/libdata/debug/usr/tests/dev/sysmon
+./usr/libdata/debug/usr/tests/fs
+./usr/libdata/debug/usr/tests/fs/ffs
+./usr/libdata/debug/usr/tests/fs/kernfs
+./usr/libdata/debug/usr/tests/fs/lfs
+./usr/libdata/debug/usr/tests/fs/msdosfs
+./usr/libdata/debug/usr/tests/fs/nfs
+./usr/libdata/debug/usr/tests/fs/nfs/nfsservice
+./usr/libdata/debug/usr/tests/fs/nullfs
+./usr/libdata/debug/usr/tests/fs/psshfs
+./usr/libdata/debug/usr/tests/fs/ptyfs
+./usr/libdata/debug/usr/tests/fs/puffs
+./usr/libdata/debug/usr/tests/fs/puffs/h_dtfs
+./usr/libdata/debug/usr/tests/fs/tmpfs
+./usr/libdata/debug/usr/tests/fs/umapfs
+./usr/libdata/debug/usr/tests/fs/union
+./usr/libdata/debug/usr/tests/fs/vfs
+./usr/libdata/debug/usr/tests/include
+./usr/libdata/debug/usr/tests/include/sys
+./usr/libdata/debug/usr/tests/ipf
+./usr/libdata/debug/usr/tests/kernel
+./usr/libdata/debug/usr/tests/kernel/kqueue
+./usr/libdata/debug/usr/tests/kernel/kqueue/read
+./usr/libdata/debug/usr/tests/kernel/kqueue/write
+./usr/libdata/debug/usr/tests/kernel/tty
+./usr/libdata/debug/usr/tests/lib
+./usr/libdata/debug/usr/tests/lib/csu
+./usr/libdata/debug/usr/tests/lib/libc
+./usr/libdata/debug/usr/tests/lib/libc/gen
+./usr/libdata/debug/usr/tests/lib/libc/hash
+./usr/libdata/debug/usr/tests/lib/libc/stdio
+./usr/libdata/debug/usr/tests/lib/libc/stdlib
+./usr/libdata/debug/usr/tests/lib/libdes
+./usr/libdata/debug/usr/tests/lib/libevent
+./usr/libdata/debug/usr/tests/lib/semaphore
+./usr/libdata/debug/usr/tests/lib/semaphore/pthread
+./usr/libdata/debug/usr/tests/lib/libobjc
+./usr/libdata/debug/usr/tests/lib/libposix
+./usr/libdata/debug/usr/tests/lib/libposix/bsd
+./usr/libdata/debug/usr/tests/lib/libposix/posix1
+./usr/libdata/debug/usr/tests/lib/libposix/posix2
+./usr/libdata/debug/usr/tests/lib/libprop
+./usr/libdata/debug/usr/tests/lib/libpthread
+./usr/libdata/debug/usr/tests/lib/librt
+./usr/libdata/debug/usr/tests/lib/libskey
+./usr/libdata/debug/usr/tests/lib/libutil
+./usr/libdata/debug/usr/tests/libexec
+./usr/libdata/debug/usr/tests/libexec/ld.elf_so
+./usr/libdata/debug/usr/tests/modules
+./usr/libdata/debug/usr/tests/net
+./usr/libdata/debug/usr/tests/net/bpf
+./usr/libdata/debug/usr/tests/net/carp
+./usr/libdata/debug/usr/tests/net/icmp
+./usr/libdata/debug/usr/tests/net/if
+./usr/libdata/debug/usr/tests/net/if_loop
+./usr/libdata/debug/usr/tests/net/sys
+./usr/libdata/debug/usr/tests/rump
+./usr/libdata/debug/usr/tests/rump/modautoload
+./usr/libdata/debug/usr/tests/rump/rumpkern
+./usr/libdata/debug/usr/tests/rump/rumpkern/h_client
+./usr/libdata/debug/usr/tests/rump/rumpkern/h_server
+./usr/libdata/debug/usr/tests/rump/rumpvfs
+./usr/libdata/debug/usr/tests/sbin
+./usr/libdata/debug/usr/tests/sbin/resize_ffs
+./usr/libdata/debug/usr/tests/syscall
+./usr/libdata/debug/usr/tests/util
+./usr/libdata/debug/usr/tests/util/df
+./usr/libdata/debug/usr/tests/util/id
+./usr/tests
+./usr/tests/atf
+./usr/tests/atf/atf-c
+./usr/tests/atf/atf-c/detail
+./usr/tests/atf/atf-c++
+./usr/tests/atf/atf-c++/detail
+./usr/tests/atf/atf-config
+./usr/tests/atf/atf-report
+./usr/tests/atf/atf-run
+./usr/tests/atf/atf-sh
+./usr/tests/atf/test-programs
+./usr/tests/crypto
+./usr/tests/crypto/libcrypto
+./usr/tests/dev
+./usr/tests/dev/audio
+./usr/tests/dev/cgd
+./usr/tests/dev/cgd/h_img2cgd
+./usr/tests/dev/md
+./usr/tests/dev/scsipi
+./usr/tests/dev/sysmon
+./usr/tests/fs
+./usr/tests/fs/ffs
+./usr/tests/fs/kernfs
+./usr/tests/fs/lfs
+./usr/tests/fs/msdosfs
+./usr/tests/fs/nfs
+./usr/tests/fs/nfs/nfsservice
+./usr/tests/fs/nullfs
+./usr/tests/fs/psshfs
+./usr/tests/fs/ptyfs
+./usr/tests/fs/puffs
+./usr/tests/fs/puffs/h_dtfs
+./usr/tests/fs/tmpfs
+./usr/tests/fs/umapfs
+./usr/tests/fs/union
+./usr/tests/fs/vfs
+./usr/tests/games
+./usr/tests/include
+./usr/tests/include/sys
+./usr/tests/ipf
+./usr/tests/ipf/expected
+./usr/tests/ipf/input
+./usr/tests/ipf/regress
+./usr/tests/kernel
+./usr/tests/kernel/kqueue
+./usr/tests/kernel/kqueue/read
+./usr/tests/kernel/kqueue/write
+./usr/tests/kernel/tty
+./usr/tests/lib
+./usr/tests/lib/csu
+./usr/tests/lib/libc
+./usr/tests/lib/libc/gen
+./usr/tests/lib/libc/hash
+./usr/tests/lib/libc/stdio
+./usr/tests/lib/libc/stdlib
+./usr/tests/lib/libdes
+./usr/tests/lib/semaphore
+./usr/tests/lib/semaphore/pthread
+./usr/tests/lib/libevent
+./usr/tests/lib/libobjc
+./usr/tests/lib/libposix
+./usr/tests/lib/libposix/bsd
+./usr/tests/lib/libposix/posix1
+./usr/tests/lib/libposix/posix2
+./usr/tests/lib/libprop
+./usr/tests/lib/libpthread
+./usr/tests/lib/librt
+./usr/tests/lib/libskey
+./usr/tests/lib/libutil
+./usr/tests/libexec
+./usr/tests/libexec/ld.elf_so
+./usr/tests/modules
+./usr/tests/net
+./usr/tests/net/bpf
+./usr/tests/net/carp
+./usr/tests/net/icmp
+./usr/tests/net/if
+./usr/tests/net/if_loop
+./usr/tests/net/sys
+./usr/tests/rump
+./usr/tests/rump/modautoload
+./usr/tests/rump/rumpkern
+./usr/tests/rump/rumpkern/h_client
+./usr/tests/rump/rumpkern/h_server
+./usr/tests/rump/rumpvfs
+./usr/tests/sbin
+./usr/tests/sbin/resize_ffs
+./usr/tests/sys
+./usr/tests/sys/rc
+./usr/tests/syscall
+./usr/tests/util
+./usr/tests/util/awk
+./usr/tests/util/bzip2
+./usr/tests/util/config
+./usr/tests/util/config/support
+./usr/tests/util/config/support/arch
+./usr/tests/util/config/support/arch/regress
+./usr/tests/util/config/support/arch/regress/conf
+./usr/tests/util/config/support/conf
+./usr/tests/util/cut
+./usr/tests/util/df
+./usr/tests/util/grep
+./usr/tests/util/id
+./usr/tests/util/m4
+./usr/tests/util/make
+./usr/tests/util/mtree
+./usr/tests/util/ps
+./usr/tests/util/sdiff
+./usr/tests/util/sh
+./usr/tests/util/sort
+./usr/tests/util/xlint
+./usr/tests/util/xlint/lint1