Module Name: src
Committed By: jmmv
Date: Tue Jul 13 21:13:33 UTC 2010
Modified Files:
src/tests: Makefile
src/tests/crypto: Makefile
src/tests/crypto/libcrypto: Makefile Makefile.inc
src/tests/fs: Makefile
src/tests/fs/puffs: Makefile
src/tests/fs/puffs/h_dtfs: Makefile
src/tests/ipf: Makefile
src/tests/ipf/expected: Makefile
src/tests/ipf/input: Makefile
src/tests/ipf/regress: Makefile
src/tests/kernel: Makefile
src/tests/kernel/kqueue: Makefile
src/tests/lib: Makefile
src/tests/lib/libc: Makefile
src/tests/lib/semaphore: Makefile
src/tests/libexec: Makefile
src/tests/modules: Makefile
src/tests/modules/k_helper: Makefile
src/tests/net: Makefile
src/tests/rump: Makefile
src/tests/sys: Makefile
src/tests/sys/rc: Makefile
src/tests/util: Makefile
src/tests/util/config: Makefile
src/tests/util/config/support/arch/regress/conf: Makefile
src/tests/util/config/support/conf: Makefile
src/tests/util/id: Makefile
Removed Files:
src/tests/crypto: Atffile
src/tests/crypto/libcrypto: Atffile
src/tests/fs: Atffile
src/tests/fs/ffs: Atffile
src/tests/fs/kernfs: Atffile
src/tests/fs/lfs: Atffile
src/tests/fs/msdosfs: Atffile
src/tests/fs/nullfs: Atffile
src/tests/fs/psshfs: Atffile
src/tests/fs/ptyfs: Atffile
src/tests/fs/puffs: Atffile
src/tests/fs/tmpfs: Atffile
src/tests/fs/umapfs: Atffile
src/tests/fs/union: Atffile
src/tests/fs/vfs: Atffile
src/tests/games: Atffile
src/tests/ipf: Atffile
src/tests/kernel: Atffile
src/tests/kernel/kqueue: Atffile
src/tests/kernel/kqueue/read: Atffile
src/tests/kernel/kqueue/write: Atffile
src/tests/kernel/tty: Atffile
src/tests/lib: Atffile
src/tests/lib/libc: Atffile
src/tests/lib/libc/hash: Atffile
src/tests/lib/libc/stdlib: Atffile
src/tests/lib/libc/string: Atffile
src/tests/lib/libevent: Atffile
src/tests/lib/semaphore: Atffile
src/tests/lib/semaphore/pthread: Atffile
src/tests/libexec: Atffile
src/tests/libexec/ld.elf_so: Atffile
src/tests/modules: Atffile
src/tests/net: Atffile
src/tests/net/bpf: Atffile
src/tests/net/icmp: Atffile
src/tests/net/sys: Atffile
src/tests/rump: Atffile
src/tests/rump/modautoload: Atffile
src/tests/rump/rumpkern: Atffile
src/tests/rump/rumpvfs: Atffile
src/tests/sys: Atffile
src/tests/sys/rc: Atffile
src/tests/syscall: Atffile
src/tests/util: Atffile
src/tests/util/awk: Atffile
src/tests/util/bzip2: Atffile
src/tests/util/config: Atffile
src/tests/util/cut: Atffile
src/tests/util/df: Atffile
src/tests/util/grep: Atffile
src/tests/util/id: Atffile
src/tests/util/m4: Atffile
src/tests/util/make: Atffile
src/tests/util/mtree: Atffile
src/tests/util/ps: Atffile
src/tests/util/sdiff: Atffile
src/tests/util/sh: Atffile
Log Message:
Get rid of static Atffiles and let bsd.test.mk generate them on the fly.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/tests/Makefile
cvs rdiff -u -r1.1 -r0 src/tests/crypto/Atffile
cvs rdiff -u -r1.1 -r1.2 src/tests/crypto/Makefile
cvs rdiff -u -r1.2 -r0 src/tests/crypto/libcrypto/Atffile
cvs rdiff -u -r1.5 -r1.6 src/tests/crypto/libcrypto/Makefile
cvs rdiff -u -r1.2 -r1.3 src/tests/crypto/libcrypto/Makefile.inc
cvs rdiff -u -r1.6 -r0 src/tests/fs/Atffile
cvs rdiff -u -r1.14 -r1.15 src/tests/fs/Makefile
cvs rdiff -u -r1.3 -r0 src/tests/fs/ffs/Atffile
cvs rdiff -u -r1.1 -r0 src/tests/fs/kernfs/Atffile
cvs rdiff -u -r1.1 -r0 src/tests/fs/lfs/Atffile
cvs rdiff -u -r1.1 -r0 src/tests/fs/msdosfs/Atffile
cvs rdiff -u -r1.2 -r0 src/tests/fs/nullfs/Atffile
cvs rdiff -u -r1.1 -r0 src/tests/fs/psshfs/Atffile
cvs rdiff -u -r1.1 -r0 src/tests/fs/ptyfs/Atffile
cvs rdiff -u -r1.5 -r0 src/tests/fs/puffs/Atffile
cvs rdiff -u -r1.8 -r1.9 src/tests/fs/puffs/Makefile
cvs rdiff -u -r1.3 -r1.4 src/tests/fs/puffs/h_dtfs/Makefile
cvs rdiff -u -r1.6 -r0 src/tests/fs/tmpfs/Atffile
cvs rdiff -u -r1.2 -r0 src/tests/fs/umapfs/Atffile
cvs rdiff -u -r1.2 -r0 src/tests/fs/union/Atffile
cvs rdiff -u -r1.2 -r0 src/tests/fs/vfs/Atffile
cvs rdiff -u -r1.4 -r0 src/tests/games/Atffile
cvs rdiff -u -r1.2 -r0 src/tests/ipf/Atffile
cvs rdiff -u -r1.2 -r1.3 src/tests/ipf/Makefile
cvs rdiff -u -r1.1 -r1.2 src/tests/ipf/expected/Makefile
cvs rdiff -u -r1.1 -r1.2 src/tests/ipf/input/Makefile
cvs rdiff -u -r1.1 -r1.2 src/tests/ipf/regress/Makefile
cvs rdiff -u -r1.3 -r0 src/tests/kernel/Atffile
cvs rdiff -u -r1.5 -r1.6 src/tests/kernel/Makefile
cvs rdiff -u -r1.1 -r0 src/tests/kernel/kqueue/Atffile
cvs rdiff -u -r1.1 -r1.2 src/tests/kernel/kqueue/Makefile
cvs rdiff -u -r1.1 -r0 src/tests/kernel/kqueue/read/Atffile
cvs rdiff -u -r1.1 -r0 src/tests/kernel/kqueue/write/Atffile
cvs rdiff -u -r1.1 -r0 src/tests/kernel/tty/Atffile
cvs rdiff -u -r1.1 -r0 src/tests/lib/Atffile
cvs rdiff -u -r1.3 -r1.4 src/tests/lib/Makefile
cvs rdiff -u -r1.4 -r0 src/tests/lib/libc/Atffile
cvs rdiff -u -r1.4 -r1.5 src/tests/lib/libc/Makefile
cvs rdiff -u -r1.1 -r0 src/tests/lib/libc/hash/Atffile
cvs rdiff -u -r1.1 -r0 src/tests/lib/libc/stdlib/Atffile
cvs rdiff -u -r1.1 -r0 src/tests/lib/libc/string/Atffile
cvs rdiff -u -r1.1 -r0 src/tests/lib/libevent/Atffile
cvs rdiff -u -r1.1 -r0 src/tests/lib/semaphore/Atffile
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/semaphore/Makefile
cvs rdiff -u -r1.1 -r0 src/tests/lib/semaphore/pthread/Atffile
cvs rdiff -u -r1.1 -r0 src/tests/libexec/Atffile
cvs rdiff -u -r1.1 -r1.2 src/tests/libexec/Makefile
cvs rdiff -u -r1.1 -r0 src/tests/libexec/ld.elf_so/Atffile
cvs rdiff -u -r1.1 -r0 src/tests/modules/Atffile
cvs rdiff -u -r1.4 -r1.5 src/tests/modules/Makefile
cvs rdiff -u -r1.4 -r1.5 src/tests/modules/k_helper/Makefile
cvs rdiff -u -r1.4 -r0 src/tests/net/Atffile
cvs rdiff -u -r1.3 -r1.4 src/tests/net/Makefile
cvs rdiff -u -r1.1 -r0 src/tests/net/bpf/Atffile
cvs rdiff -u -r1.1 -r0 src/tests/net/icmp/Atffile
cvs rdiff -u -r1.5 -r0 src/tests/net/sys/Atffile
cvs rdiff -u -r1.5 -r0 src/tests/rump/Atffile
cvs rdiff -u -r1.4 -r1.5 src/tests/rump/Makefile
cvs rdiff -u -r1.1 -r0 src/tests/rump/modautoload/Atffile
cvs rdiff -u -r1.2 -r0 src/tests/rump/rumpkern/Atffile
cvs rdiff -u -r1.1 -r0 src/tests/rump/rumpvfs/Atffile
cvs rdiff -u -r1.1 -r0 src/tests/sys/Atffile
cvs rdiff -u -r1.1 -r1.2 src/tests/sys/Makefile
cvs rdiff -u -r1.1 -r0 src/tests/sys/rc/Atffile
cvs rdiff -u -r1.1 -r1.2 src/tests/sys/rc/Makefile
cvs rdiff -u -r1.2 -r0 src/tests/syscall/Atffile
cvs rdiff -u -r1.4 -r0 src/tests/util/Atffile
cvs rdiff -u -r1.7 -r1.8 src/tests/util/Makefile
cvs rdiff -u -r1.1 -r0 src/tests/util/awk/Atffile
cvs rdiff -u -r1.1 -r0 src/tests/util/bzip2/Atffile
cvs rdiff -u -r1.1 -r0 src/tests/util/config/Atffile
cvs rdiff -u -r1.2 -r1.3 src/tests/util/config/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/tests/util/config/support/arch/regress/conf/Makefile
cvs rdiff -u -r1.1 -r1.2 src/tests/util/config/support/conf/Makefile
cvs rdiff -u -r1.1 -r0 src/tests/util/cut/Atffile
cvs rdiff -u -r1.4 -r0 src/tests/util/df/Atffile
cvs rdiff -u -r1.1 -r0 src/tests/util/grep/Atffile
cvs rdiff -u -r1.4 -r0 src/tests/util/id/Atffile
cvs rdiff -u -r1.3 -r1.4 src/tests/util/id/Makefile
cvs rdiff -u -r1.1 -r0 src/tests/util/m4/Atffile
cvs rdiff -u -r1.1 -r0 src/tests/util/make/Atffile
cvs rdiff -u -r1.1 -r0 src/tests/util/mtree/Atffile
cvs rdiff -u -r1.4 -r0 src/tests/util/ps/Atffile
cvs rdiff -u -r1.1 -r0 src/tests/util/sdiff/Atffile
cvs rdiff -u -r1.4 -r0 src/tests/util/sh/Atffile
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.20 src/tests/Makefile:1.21
--- src/tests/Makefile:1.20 Mon Mar 15 19:03:08 2010
+++ src/tests/Makefile Tue Jul 13 21:13:21 2010
@@ -1,7 +1,10 @@
-# $NetBSD: Makefile,v 1.20 2010/03/15 19:03:08 jmmv Exp $
+# $NetBSD: Makefile,v 1.21 2010/07/13 21:13:21 jmmv Exp $
.include <bsd.own.mk>
+TESTSDIR= ${TESTSBASE}
+ATFFILE= yes
+
SUBDIR= crypto games ipf util
.if ${MKATF} != "no"
@@ -13,7 +16,5 @@
.endif
-TESTSDIR= ${TESTSBASE}
-
.include <bsd.test.mk>
.include <bsd.subdir.mk>
Index: src/tests/crypto/Makefile
diff -u src/tests/crypto/Makefile:1.1 src/tests/crypto/Makefile:1.2
--- src/tests/crypto/Makefile:1.1 Fri Feb 13 20:58:14 2009
+++ src/tests/crypto/Makefile Tue Jul 13 21:13:21 2010
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2009/02/13 20:58:14 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2010/07/13 21:13:21 jmmv Exp $
.include <bsd.own.mk>
-SUBDIR= libcrypto
+TESTS_SUBDIRS= libcrypto
TESTSDIR= ${TESTSBASE}/crypto
.include <bsd.test.mk>
-.include <bsd.subdir.mk>
Index: src/tests/crypto/libcrypto/Makefile
diff -u src/tests/crypto/libcrypto/Makefile:1.5 src/tests/crypto/libcrypto/Makefile:1.6
--- src/tests/crypto/libcrypto/Makefile:1.5 Sun Jul 11 06:16:54 2010
+++ src/tests/crypto/libcrypto/Makefile Tue Jul 13 21:13:21 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/07/11 06:16:54 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2010/07/13 21:13:21 jmmv Exp $
.include <bsd.own.mk>
@@ -28,5 +28,3 @@
.include <bsd.test.mk>
.endif
-
-.include <bsd.subdir.mk>
Index: src/tests/crypto/libcrypto/Makefile.inc
diff -u src/tests/crypto/libcrypto/Makefile.inc:1.2 src/tests/crypto/libcrypto/Makefile.inc:1.3
--- src/tests/crypto/libcrypto/Makefile.inc:1.2 Mon Jul 20 20:41:52 2009
+++ src/tests/crypto/libcrypto/Makefile.inc Tue Jul 13 21:13:21 2010
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.2 2009/07/20 20:41:52 christos Exp $
+# $NetBSD: Makefile.inc,v 1.3 2010/07/13 21:13:21 jmmv Exp $
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/crypto/libcrypto
+ATFFILE= no
.if defined(HELPER_NAME)
HELPER_SRCS?= ${HELPER_NAME}.c
@@ -12,8 +13,6 @@
MAN= # empty
BINDIR= ${TESTSDIR}
-NOATFFILE= yes
-
DPADD+= ${LIBCRYPTO} ${LIBCRYPT}
LDADD+= -lcrypto -lcrypt
Index: src/tests/fs/Makefile
diff -u src/tests/fs/Makefile:1.14 src/tests/fs/Makefile:1.15
--- src/tests/fs/Makefile:1.14 Tue Jul 6 14:44:29 2010
+++ src/tests/fs/Makefile Tue Jul 13 21:13:22 2010
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.14 2010/07/06 14:44:29 pooka Exp $
+# $NetBSD: Makefile,v 1.15 2010/07/13 21:13:22 jmmv Exp $
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/fs
-SUBDIR+= ffs kernfs lfs msdosfs nullfs psshfs ptyfs puffs
-SUBDIR+= tmpfs umapfs union
-SUBDIR+= vfs
+TESTS_SUBDIRS+= ffs kernfs lfs msdosfs nullfs psshfs ptyfs puffs
+TESTS_SUBDIRS+= tmpfs umapfs union
+TESTS_SUBDIRS+= vfs
FILES= h_funcs.subr
FILESDIR= ${TESTSDIR}
.include <bsd.test.mk>
-.include <bsd.subdir.mk>
Index: src/tests/fs/puffs/Makefile
diff -u src/tests/fs/puffs/Makefile:1.8 src/tests/fs/puffs/Makefile:1.9
--- src/tests/fs/puffs/Makefile:1.8 Mon Jul 12 13:09:19 2010
+++ src/tests/fs/puffs/Makefile Tue Jul 13 21:13:23 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2010/07/12 13:09:19 pooka Exp $
+# $NetBSD: Makefile,v 1.9 2010/07/13 21:13:23 jmmv Exp $
#
.include <bsd.own.mk>
@@ -21,4 +21,3 @@
WARNS=2
.include <bsd.test.mk>
-.include <bsd.subdir.mk>
Index: src/tests/fs/puffs/h_dtfs/Makefile
diff -u src/tests/fs/puffs/h_dtfs/Makefile:1.3 src/tests/fs/puffs/h_dtfs/Makefile:1.4
--- src/tests/fs/puffs/h_dtfs/Makefile:1.3 Tue Jul 6 16:43:48 2010
+++ src/tests/fs/puffs/h_dtfs/Makefile Tue Jul 13 21:13:23 2010
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2010/07/06 16:43:48 pooka Exp $
+# $NetBSD: Makefile,v 1.4 2010/07/13 21:13:23 jmmv Exp $
-NOATFFILE= # defined
TESTSDIR= ${TESTSBASE}/fs/puffs/h_dtfs
+ATFFILE= no
TESTS_C= h_dtfs
Index: src/tests/ipf/Makefile
diff -u src/tests/ipf/Makefile:1.2 src/tests/ipf/Makefile:1.3
--- src/tests/ipf/Makefile:1.2 Sat Jul 10 17:28:36 2010
+++ src/tests/ipf/Makefile Tue Jul 13 21:13:25 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/07/10 17:28:36 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2010/07/13 21:13:25 jmmv Exp $
NOMAN= # defined
@@ -15,4 +15,3 @@
SUBDIR= regress input expected
.include <bsd.test.mk>
-.include <bsd.subdir.mk>
Index: src/tests/ipf/expected/Makefile
diff -u src/tests/ipf/expected/Makefile:1.1 src/tests/ipf/expected/Makefile:1.2
--- src/tests/ipf/expected/Makefile:1.1 Fri Feb 20 21:42:59 2009
+++ src/tests/ipf/expected/Makefile Tue Jul 13 21:13:25 2010
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2009/02/20 21:42:59 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2010/07/13 21:13:25 jmmv Exp $
TESTSDIR= ${TESTSBASE}/ipf
-
-NOATFFILE= yes
+ATFFILE= no
FILESDIR= ${TESTSDIR}/expected
FILES= bpf-f1
Index: src/tests/ipf/input/Makefile
diff -u src/tests/ipf/input/Makefile:1.1 src/tests/ipf/input/Makefile:1.2
--- src/tests/ipf/input/Makefile:1.1 Fri Feb 20 21:43:00 2009
+++ src/tests/ipf/input/Makefile Tue Jul 13 21:13:25 2010
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2009/02/20 21:43:00 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2010/07/13 21:13:25 jmmv Exp $
TESTSDIR= ${TESTSBASE}/ipf
-
-NOATFFILE= yes
+ATFFILE= no
FILESDIR= ${TESTSDIR}/input
FILES= f1
Index: src/tests/ipf/regress/Makefile
diff -u src/tests/ipf/regress/Makefile:1.1 src/tests/ipf/regress/Makefile:1.2
--- src/tests/ipf/regress/Makefile:1.1 Fri Feb 20 21:43:01 2009
+++ src/tests/ipf/regress/Makefile Tue Jul 13 21:13:25 2010
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2009/02/20 21:43:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2010/07/13 21:13:25 jmmv Exp $
TESTSDIR= ${TESTSBASE}/ipf
-
-NOATFFILE= yes
+ATFFILE= no
FILESDIR= ${TESTSDIR}/regress
FILES= bpf-f1
Index: src/tests/kernel/Makefile
diff -u src/tests/kernel/Makefile:1.5 src/tests/kernel/Makefile:1.6
--- src/tests/kernel/Makefile:1.5 Mon Jun 28 19:03:59 2010
+++ src/tests/kernel/Makefile Tue Jul 13 21:13:25 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/06/28 19:03:59 pooka Exp $
+# $NetBSD: Makefile,v 1.6 2010/07/13 21:13:25 jmmv Exp $
NOMAN= # defined
@@ -6,7 +6,7 @@
TESTSDIR= ${TESTSBASE}/kernel
-SUBDIR= kqueue tty
+TESTS_SUBDIRS= kqueue tty
TESTS_C= t_lock
TESTS_C+= t_lwpctl
@@ -32,4 +32,3 @@
CPPFLAGS.subr_extent.c= -D_EXTENT_TESTING -D__POOL_EXPOSE
.include <bsd.test.mk>
-.include <bsd.subdir.mk>
Index: src/tests/kernel/kqueue/Makefile
diff -u src/tests/kernel/kqueue/Makefile:1.1 src/tests/kernel/kqueue/Makefile:1.2
--- src/tests/kernel/kqueue/Makefile:1.1 Fri Feb 20 21:39:57 2009
+++ src/tests/kernel/kqueue/Makefile Tue Jul 13 21:13:25 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2009/02/20 21:39:57 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2010/07/13 21:13:25 jmmv Exp $
NOMAN= # defined
@@ -6,8 +6,8 @@
TESTSDIR= ${TESTSBASE}/kernel/kqueue
-SUBDIR= read
-SUBDIR+= write
+TESTS_SUBDIRS= read
+TESTS_SUBDIRS+= write
TESTS_C= t_ioctl
TESTS_C+= t_proc1
@@ -15,4 +15,3 @@
TESTS_C+= t_sig
.include <bsd.test.mk>
-.include <bsd.subdir.mk>
Index: src/tests/lib/Makefile
diff -u src/tests/lib/Makefile:1.3 src/tests/lib/Makefile:1.4
--- src/tests/lib/Makefile:1.3 Thu Jun 10 22:03:43 2010
+++ src/tests/lib/Makefile Tue Jul 13 21:13:26 2010
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2010/06/10 22:03:43 pooka Exp $
+# $NetBSD: Makefile,v 1.4 2010/07/13 21:13:26 jmmv Exp $
.include <bsd.own.mk>
-SUBDIR= libc libevent semaphore
+TESTS_SUBDIRS= libc libevent semaphore
TESTSDIR= ${TESTSBASE}/lib
.include <bsd.test.mk>
-.include <bsd.subdir.mk>
Index: src/tests/lib/libc/Makefile
diff -u src/tests/lib/libc/Makefile:1.4 src/tests/lib/libc/Makefile:1.5
--- src/tests/lib/libc/Makefile:1.4 Fri Feb 26 09:35:08 2010
+++ src/tests/lib/libc/Makefile Tue Jul 13 21:13:26 2010
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.4 2010/02/26 09:35:08 martin Exp $
+# $NetBSD: Makefile,v 1.5 2010/07/13 21:13:26 jmmv Exp $
.include <bsd.own.mk>
-SUBDIR+= hash stdlib
+TESTS_SUBDIRS+= hash stdlib
# Disabled for now, only test in there is very expensive
#SUBDIR+= string
TESTSDIR= ${TESTSBASE}/lib/libc
-.include <bsd.subdir.mk>
.include <bsd.test.mk>
Index: src/tests/lib/semaphore/Makefile
diff -u src/tests/lib/semaphore/Makefile:1.1 src/tests/lib/semaphore/Makefile:1.2
--- src/tests/lib/semaphore/Makefile:1.1 Thu Jun 10 22:03:43 2010
+++ src/tests/lib/semaphore/Makefile Tue Jul 13 21:13:27 2010
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2010/06/10 22:03:43 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2010/07/13 21:13:27 jmmv Exp $
#
-SUBDIR= pthread
+TESTS_SUBDIRS= pthread
TESTSDIR= ${TESTSBASE}/lib/semaphore
.include <bsd.test.mk>
-.include <bsd.subdir.mk>
Index: src/tests/libexec/Makefile
diff -u src/tests/libexec/Makefile:1.1 src/tests/libexec/Makefile:1.2
--- src/tests/libexec/Makefile:1.1 Thu Sep 24 21:33:45 2009
+++ src/tests/libexec/Makefile Tue Jul 13 21:13:28 2010
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2009/09/24 21:33:45 pooka Exp $
+# $NetBSD: Makefile,v 1.2 2010/07/13 21:13:28 jmmv Exp $
#
.include <bsd.own.mk>
-SUBDIR= ld.elf_so
+TESTS_SUBDIRS= ld.elf_so
TESTSDIR= ${TESTSBASE}/libexec
.include <bsd.test.mk>
-.include <bsd.subdir.mk>
Index: src/tests/modules/Makefile
diff -u src/tests/modules/Makefile:1.4 src/tests/modules/Makefile:1.5
--- src/tests/modules/Makefile:1.4 Wed Nov 12 12:36:29 2008
+++ src/tests/modules/Makefile Tue Jul 13 21:13:28 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/11/12 12:36:29 ad Exp $
+# $NetBSD: Makefile,v 1.5 2010/07/13 21:13:28 jmmv Exp $
.include <bsd.own.mk>
@@ -16,5 +16,4 @@
SUBDIR= k_helper
-.include <bsd.subdir.mk>
.include <bsd.test.mk>
Index: src/tests/modules/k_helper/Makefile
diff -u src/tests/modules/k_helper/Makefile:1.4 src/tests/modules/k_helper/Makefile:1.5
--- src/tests/modules/k_helper/Makefile:1.4 Sat May 31 19:58:35 2008
+++ src/tests/modules/k_helper/Makefile Tue Jul 13 21:13:28 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/05/31 19:58:35 dyoung Exp $
+# $NetBSD: Makefile,v 1.5 2010/07/13 21:13:28 jmmv Exp $
.include <bsd.own.mk>
@@ -7,7 +7,7 @@
SRCS= k_helper.c
-NOATFFILE= # defined
+ATFFILE= no
NOMAN= # defined
.include <bsd.test.mk>
Index: src/tests/net/Makefile
diff -u src/tests/net/Makefile:1.3 src/tests/net/Makefile:1.4
--- src/tests/net/Makefile:1.3 Sun Jul 4 19:31:30 2010
+++ src/tests/net/Makefile Tue Jul 13 21:13:28 2010
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2010/07/04 19:31:30 pooka Exp $
+# $NetBSD: Makefile,v 1.4 2010/07/13 21:13:28 jmmv Exp $
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/net
-SUBDIR= bpf icmp sys
+TESTS_SUBDIRS= bpf icmp sys
.include <bsd.test.mk>
-.include <bsd.subdir.mk>
Index: src/tests/rump/Makefile
diff -u src/tests/rump/Makefile:1.4 src/tests/rump/Makefile:1.5
--- src/tests/rump/Makefile:1.4 Wed Jun 16 19:29:33 2010
+++ src/tests/rump/Makefile Tue Jul 13 21:13:29 2010
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2010/06/16 19:29:33 pooka Exp $
+# $NetBSD: Makefile,v 1.5 2010/07/13 21:13:29 jmmv Exp $
#
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/rump
-SUBDIR= kernspace .WAIT rumpkern rumpvfs modautoload
+SUBDIR= kernspace
+TESTS_SUBDIRS= .WAIT rumpkern rumpvfs modautoload
.include <bsd.test.mk>
-.include <bsd.subdir.mk>
Index: src/tests/sys/Makefile
diff -u src/tests/sys/Makefile:1.1 src/tests/sys/Makefile:1.2
--- src/tests/sys/Makefile:1.1 Mon Mar 15 19:03:08 2010
+++ src/tests/sys/Makefile Tue Jul 13 21:13:30 2010
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2010/03/15 19:03:08 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2010/07/13 21:13:30 jmmv Exp $
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/sys
-SUBDIR+= rc
+TESTS_SUBDIRS+= rc
.include <bsd.test.mk>
-.include <bsd.subdir.mk>
Index: src/tests/sys/rc/Makefile
diff -u src/tests/sys/rc/Makefile:1.1 src/tests/sys/rc/Makefile:1.2
--- src/tests/sys/rc/Makefile:1.1 Mon Mar 15 19:03:08 2010
+++ src/tests/sys/rc/Makefile Tue Jul 13 21:13:30 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2010/03/15 19:03:08 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2010/07/13 21:13:30 jmmv Exp $
.include <bsd.own.mk>
@@ -10,5 +10,4 @@
SCRIPTS= h_args.sh \
h_simple.sh
-.include <bsd.subdir.mk>
.include <bsd.test.mk>
Index: src/tests/util/Makefile
diff -u src/tests/util/Makefile:1.7 src/tests/util/Makefile:1.8
--- src/tests/util/Makefile:1.7 Sat Jun 5 22:38:39 2010
+++ src/tests/util/Makefile Tue Jul 13 21:13:30 2010
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.7 2010/06/05 22:38:39 dholland Exp $
+# $NetBSD: Makefile,v 1.8 2010/07/13 21:13:30 jmmv Exp $
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/util
-SUBDIR= awk bzip2 config cut df grep id m4 make mtree ps sdiff sh
+TESTS_SUBDIRS= awk bzip2 config cut df grep id m4 make mtree ps sdiff sh
TESTS_SH= t_basename
TESTS_SH+= t_cp
@@ -17,4 +17,3 @@
TESTS_SH+= t_tar
.include <bsd.test.mk>
-.include <bsd.subdir.mk>
Index: src/tests/util/config/Makefile
diff -u src/tests/util/config/Makefile:1.2 src/tests/util/config/Makefile:1.3
--- src/tests/util/config/Makefile:1.2 Sat Jul 10 16:24:12 2010
+++ src/tests/util/config/Makefile Tue Jul 13 21:13:31 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/07/10 16:24:12 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2010/07/13 21:13:31 jmmv Exp $
SUBDIR= support
@@ -24,4 +24,3 @@
FILES+= support/conf/files
.include <bsd.test.mk>
-.include <bsd.subdir.mk>
Index: src/tests/util/config/support/arch/regress/conf/Makefile
diff -u src/tests/util/config/support/arch/regress/conf/Makefile:1.1 src/tests/util/config/support/arch/regress/conf/Makefile:1.2
--- src/tests/util/config/support/arch/regress/conf/Makefile:1.1 Fri Feb 13 05:19:51 2009
+++ src/tests/util/config/support/arch/regress/conf/Makefile Tue Jul 13 21:13:31 2010
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2009/02/13 05:19:51 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2010/07/13 21:13:31 jmmv Exp $
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/util/config
-
-NOATFFILE= # defined
+ATFFILE= no
FILESDIR= ${TESTSDIR}/support/arch/regress/conf
FILES= Makefile.regress
Index: src/tests/util/config/support/conf/Makefile
diff -u src/tests/util/config/support/conf/Makefile:1.1 src/tests/util/config/support/conf/Makefile:1.2
--- src/tests/util/config/support/conf/Makefile:1.1 Fri Feb 13 05:19:51 2009
+++ src/tests/util/config/support/conf/Makefile Tue Jul 13 21:13:31 2010
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2009/02/13 05:19:51 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2010/07/13 21:13:31 jmmv Exp $
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/util/config
-
-NOATFFILE= # defined
+ATFFILE= no
FILESDIR= ${TESTSDIR}/support/conf
FILES= files
Index: src/tests/util/id/Makefile
diff -u src/tests/util/id/Makefile:1.3 src/tests/util/id/Makefile:1.4
--- src/tests/util/id/Makefile:1.3 Wed Nov 21 15:39:34 2007
+++ src/tests/util/id/Makefile Tue Jul 13 21:13:32 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2007/11/21 15:39:34 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2010/07/13 21:13:32 jmmv Exp $
NOMAN= # defined
@@ -16,4 +16,3 @@
SRCS= id.c pwgr.c
.include <bsd.test.mk>
-.include <bsd.subdir.mk>
