Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src Make tests set generation optional, skipped for MKATF=no build.
details: https://anonhg.NetBSD.org/src/rev/4810d44ee695
branches: trunk
changeset: 759425:4810d44ee695
user: njoly <njoly%NetBSD.org@localhost>
date: Wed Dec 08 23:56:01 2010 +0000
description:
Make tests set generation optional, skipped for MKATF=no build.
diffstat:
distrib/sets/lists/base/mi | 4 +-
distrib/sets/sets.subr | 22 ++-
etc/Makefile | 7 +-
etc/mtree/Makefile | 6 +-
etc/mtree/NetBSD.dist.base | 200 +-------------------------------------------
etc/mtree/NetBSD.dist.tests | 200 ++++++++++++++++++++++++++++++++++++++++++++
tests/Makefile | 12 +-
7 files changed, 232 insertions(+), 219 deletions(-)
diffs (truncated from 576 to 300 lines):
diff -r 2fb8efad84ab -r 4810d44ee695 distrib/sets/lists/base/mi
--- a/distrib/sets/lists/base/mi Wed Dec 08 23:50:14 2010 +0000
+++ b/distrib/sets/lists/base/mi Wed Dec 08 23:56:01 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.897 2010/12/08 07:20:59 kefren Exp $
+# $NetBSD: mi,v 1.898 2010/12/08 23:56:01 njoly Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -4805,7 +4805,7 @@
./var/db/obsolete/games base-sys-root
./var/db/obsolete/man base-sys-root
./var/db/obsolete/misc base-sys-root
-./var/db/obsolete/tests base-sys-root
+./var/db/obsolete/tests base-sys-root atf
./var/db/obsolete/text base-sys-root
./var/db/postfix base-postfix-root
./var/db/xdm base-sys-root
diff -r 2fb8efad84ab -r 4810d44ee695 distrib/sets/sets.subr
--- a/distrib/sets/sets.subr Wed Dec 08 23:50:14 2010 +0000
+++ b/distrib/sets/sets.subr Wed Dec 08 23:56:01 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.124 2010/06/19 03:50:30 mrg Exp $
+# $NetBSD: sets.subr,v 1.125 2010/12/08 23:56:01 njoly Exp $
#
#
@@ -131,10 +131,17 @@
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 @@
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"
@@ -168,7 +171,7 @@
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.124 2010/06/19 03:50:30 mrg Exp $
+# # $NetBSD: sets.subr,v 1.125 2010/12/08 23:56:01 njoly Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
@@ -188,6 +191,7 @@
# obsolete file is obsolete, and only printed if
# ${obsolete} != 0
#
+# atf ${MKATF} != no
# bfd obsolete, use binutils.
# binutils ${MKBINUTILS} != no
# catpages ${MKCATPAGES} != no
diff -r 2fb8efad84ab -r 4810d44ee695 etc/Makefile
--- a/etc/Makefile Wed Dec 08 23:50:14 2010 +0000
+++ b/etc/Makefile Wed Dec 08 23:56:01 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.382 2010/10/04 13:55:39 tsutsui Exp $
+# $NetBSD: Makefile,v 1.383 2010/12/08 23:56:01 njoly Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@@ -364,10 +364,13 @@
# Install var/db/obsolete set lists; this is performed by "make build"
#
OBSOLETE.dir= ${.OBJDIR}/obsolete.dir
-OBSOLETE.files= base comp etc games man misc tests text
+OBSOLETE.files= base comp etc games man misc text
.if ${MKKMOD} != "no"
OBSOLETE.files+= modules
.endif
+.if ${MKATF} != "no"
+OBSOLETE.files+= tests
+.endif
.if ${MKX11} != "no"
OBSOLETE.files+= xbase xcomp xetc xfont xserver
.endif
diff -r 2fb8efad84ab -r 4810d44ee695 etc/mtree/Makefile
--- a/etc/mtree/Makefile Wed Dec 08 23:50:14 2010 +0000
+++ b/etc/mtree/Makefile Wed Dec 08 23:56:01 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2010/04/27 03:01:25 dyoung Exp $
+# $NetBSD: Makefile,v 1.18 2010/12/08 23:56:02 njoly Exp $
.include <bsd.own.mk>
@@ -14,6 +14,10 @@
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
diff -r 2fb8efad84ab -r 4810d44ee695 etc/mtree/NetBSD.dist.base
--- a/etc/mtree/NetBSD.dist.base Wed Dec 08 23:50:14 2010 +0000
+++ b/etc/mtree/NetBSD.dist.base Wed Dec 08 23:56:01 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.base,v 1.66 2010/12/05 05:55:29 christos Exp $
+# $NetBSD: NetBSD.dist.base,v 1.67 2010/12/08 23:56:02 njoly Exp $
# @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
# Do not customize this file as it may be overwritten on upgrades.
@@ -195,92 +195,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
@@ -1138,118 +1052,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
Home |
Main Index |
Thread Index |
Old Index