Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/tests Get rid of static Atffiles and let bsd.test.mk generat...
details: https://anonhg.NetBSD.org/src/rev/b9ab414db169
branches: trunk
changeset: 756353:b9ab414db169
user: jmmv <jmmv%NetBSD.org@localhost>
date: Tue Jul 13 21:13:21 2010 +0000
description:
Get rid of static Atffiles and let bsd.test.mk generate them on the fly.
diffstat:
tests/Makefile | 7 ++--
tests/crypto/Atffile | 6 ----
tests/crypto/Makefile | 5 +--
tests/crypto/libcrypto/Atffile | 9 ------
tests/crypto/libcrypto/Makefile | 4 +--
tests/crypto/libcrypto/Makefile.inc | 5 +--
tests/fs/Atffile | 7 ----
tests/fs/Makefile | 9 ++---
tests/fs/ffs/Atffile | 6 ----
tests/fs/kernfs/Atffile | 6 ----
tests/fs/lfs/Atffile | 6 ----
tests/fs/msdosfs/Atffile | 6 ----
tests/fs/nullfs/Atffile | 6 ----
tests/fs/psshfs/Atffile | 6 ----
tests/fs/ptyfs/Atffile | 6 ----
tests/fs/puffs/Atffile | 6 ----
tests/fs/puffs/Makefile | 3 +-
tests/fs/puffs/h_dtfs/Makefile | 4 +-
tests/fs/tmpfs/Atffile | 30 --------------------
tests/fs/umapfs/Atffile | 6 ----
tests/fs/union/Atffile | 6 ----
tests/fs/vfs/Atffile | 6 ----
tests/games/Atffile | 6 ----
tests/ipf/Atffile | 13 --------
tests/ipf/Makefile | 3 +-
tests/ipf/expected/Makefile | 5 +--
tests/ipf/input/Makefile | 5 +--
tests/ipf/regress/Makefile | 5 +--
tests/kernel/Atffile | 19 ------------
tests/kernel/Makefile | 5 +--
tests/kernel/kqueue/Atffile | 12 --------
tests/kernel/kqueue/Makefile | 7 ++--
tests/kernel/kqueue/read/Atffile | 10 ------
tests/kernel/kqueue/write/Atffile | 8 -----
tests/kernel/tty/Atffile | 6 ----
tests/lib/Atffile | 6 ----
tests/lib/Makefile | 5 +--
tests/lib/libc/Atffile | 7 ----
tests/lib/libc/Makefile | 5 +--
tests/lib/libc/hash/Atffile | 6 ----
tests/lib/libc/stdlib/Atffile | 6 ----
tests/lib/libc/string/Atffile | 6 ----
tests/lib/libevent/Atffile | 6 ----
tests/lib/semaphore/Atffile | 6 ----
tests/lib/semaphore/Makefile | 5 +--
tests/lib/semaphore/pthread/Atffile | 6 ----
tests/libexec/Atffile | 6 ----
tests/libexec/Makefile | 5 +--
tests/libexec/ld.elf_so/Atffile | 6 ----
tests/modules/Atffile | 6 ----
tests/modules/Makefile | 3 +-
tests/modules/k_helper/Makefile | 4 +-
tests/net/Atffile | 6 ----
tests/net/Makefile | 5 +--
tests/net/bpf/Atffile | 6 ----
tests/net/icmp/Atffile | 6 ----
tests/net/sys/Atffile | 6 ----
tests/rump/Atffile | 7 ----
tests/rump/Makefile | 6 ++--
tests/rump/modautoload/Atffile | 6 ----
tests/rump/rumpkern/Atffile | 6 ----
tests/rump/rumpvfs/Atffile | 6 ----
tests/sys/Atffile | 6 ----
tests/sys/Makefile | 5 +--
tests/sys/rc/Atffile | 6 ----
tests/sys/rc/Makefile | 3 +-
tests/syscall/Atffile | 6 ----
tests/util/Atffile | 6 ----
tests/util/Makefile | 5 +--
tests/util/awk/Atffile | 6 ----
tests/util/bzip2/Atffile | 6 ----
tests/util/config/Atffile | 6 ----
tests/util/config/Makefile | 3 +-
tests/util/config/support/arch/regress/conf/Makefile | 5 +--
tests/util/config/support/conf/Makefile | 5 +--
tests/util/cut/Atffile | 6 ----
tests/util/df/Atffile | 6 ----
tests/util/grep/Atffile | 6 ----
tests/util/id/Atffile | 6 ----
tests/util/id/Makefile | 3 +-
tests/util/m4/Atffile | 6 ----
tests/util/make/Atffile | 6 ----
tests/util/mtree/Atffile | 6 ----
tests/util/ps/Atffile | 6 ----
tests/util/sdiff/Atffile | 6 ----
tests/util/sh/Atffile | 6 ----
86 files changed, 55 insertions(+), 489 deletions(-)
diffs (truncated from 1119 to 300 lines):
diff -r c810fca24530 -r b9ab414db169 tests/Makefile
--- a/tests/Makefile Tue Jul 13 21:12:38 2010 +0000
+++ b/tests/Makefile Tue Jul 13 21:13:21 2010 +0000
@@ -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>
diff -r c810fca24530 -r b9ab414db169 tests/crypto/Atffile
--- a/tests/crypto/Atffile Tue Jul 13 21:12:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-Content-Type: application/X-atf-atffile; version="1"
-X-NetBSD-Id: "$NetBSD: Atffile,v 1.1 2009/02/13 20:58:13 jmmv Exp $"
-
-prop: test-suite = "NetBSD"
-
-tp-glob: *
diff -r c810fca24530 -r b9ab414db169 tests/crypto/Makefile
--- a/tests/crypto/Makefile Tue Jul 13 21:12:38 2010 +0000
+++ b/tests/crypto/Makefile Tue Jul 13 21:13:21 2010 +0000
@@ -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>
diff -r c810fca24530 -r b9ab414db169 tests/crypto/libcrypto/Atffile
--- a/tests/crypto/libcrypto/Atffile Tue Jul 13 21:12:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,9 +0,0 @@
-Content-Type: application/X-atf-atffile; version="1"
-
-prop: test-suite = "NetBSD"
-
-tp: t_certs
-tp: t_ciphers
-tp: t_hashes
-tp: t_libcrypto
-tp: t_pubkey
diff -r c810fca24530 -r b9ab414db169 tests/crypto/libcrypto/Makefile
--- a/tests/crypto/libcrypto/Makefile Tue Jul 13 21:12:38 2010 +0000
+++ b/tests/crypto/libcrypto/Makefile Tue Jul 13 21:13:21 2010 +0000
@@ -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>
diff -r c810fca24530 -r b9ab414db169 tests/crypto/libcrypto/Makefile.inc
--- a/tests/crypto/libcrypto/Makefile.inc Tue Jul 13 21:12:38 2010 +0000
+++ b/tests/crypto/libcrypto/Makefile.inc Tue Jul 13 21:13:21 2010 +0000
@@ -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
diff -r c810fca24530 -r b9ab414db169 tests/fs/Atffile
--- a/tests/fs/Atffile Tue Jul 13 21:12:38 2010 +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.6 2010/03/31 18:37:06 njoly Exp $"
-
-prop: test-suite = "NetBSD"
-
-tp-glob: *fs
-tp: union
diff -r c810fca24530 -r b9ab414db169 tests/fs/Makefile
--- a/tests/fs/Makefile Tue Jul 13 21:12:38 2010 +0000
+++ b/tests/fs/Makefile Tue Jul 13 21:13:21 2010 +0000
@@ -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>
diff -r c810fca24530 -r b9ab414db169 tests/fs/ffs/Atffile
--- a/tests/fs/ffs/Atffile Tue Jul 13 21:12:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-Content-Type: application/X-atf-atffile; version="1"
-X-NetBSD-Id: "$NetBSD: Atffile,v 1.3 2010/03/31 18:40:26 njoly Exp $"
-
-prop: test-suite = "NetBSD"
-
-tp-glob: t_*
diff -r c810fca24530 -r b9ab414db169 tests/fs/kernfs/Atffile
--- a/tests/fs/kernfs/Atffile Tue Jul 13 21:12:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-Content-Type: application/X-atf-atffile; version="1"
-X-NetBSD-Id: "$NetBSD: Atffile,v 1.1 2010/03/31 19:14:30 pooka Exp $"
-
-prop: test-suite = "NetBSD"
-
-tp-glob: t_*
diff -r c810fca24530 -r b9ab414db169 tests/fs/lfs/Atffile
--- a/tests/fs/lfs/Atffile Tue Jul 13 21:12:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-Content-Type: application/X-atf-atffile; version="1"
-X-NetBSD-Id: "$NetBSD: Atffile,v 1.1 2010/06/28 09:45:06 pooka Exp $"
-
-prop: test-suite = "NetBSD"
-
-tp-glob: t_*
diff -r c810fca24530 -r b9ab414db169 tests/fs/msdosfs/Atffile
--- a/tests/fs/msdosfs/Atffile Tue Jul 13 21:12:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-Content-Type: application/X-atf-atffile; version="1"
-X-NetBSD-Id: "$NetBSD: Atffile,v 1.1 2010/04/13 10:21:47 pooka Exp $"
-
-prop: test-suite = "NetBSD"
-
-tp-glob: t_*
diff -r c810fca24530 -r b9ab414db169 tests/fs/nullfs/Atffile
--- a/tests/fs/nullfs/Atffile Tue Jul 13 21:12:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-Content-Type: application/X-atf-atffile; version="1"
-X-NetBSD-Id: "$NetBSD: Atffile,v 1.2 2010/03/31 18:40:26 njoly Exp $"
-
-prop: test-suite = "NetBSD"
-
-tp-glob: t_*
diff -r c810fca24530 -r b9ab414db169 tests/fs/psshfs/Atffile
--- a/tests/fs/psshfs/Atffile Tue Jul 13 21:12:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-Content-Type: application/X-atf-atffile; version="1"
-X-NetBSD-Id: "$NetBSD: Atffile,v 1.1 2010/07/06 14:06:22 pooka Exp $"
-
-prop: test-suite = "NetBSD"
-
-tp-glob: t_*
diff -r c810fca24530 -r b9ab414db169 tests/fs/ptyfs/Atffile
--- a/tests/fs/ptyfs/Atffile Tue Jul 13 21:12:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-Content-Type: application/X-atf-atffile; version="1"
-X-NetBSD-Id: "$NetBSD: Atffile,v 1.1 2010/06/11 23:52:38 pooka Exp $"
-
-prop: test-suite = "NetBSD"
-
-tp-glob: t_*
diff -r c810fca24530 -r b9ab414db169 tests/fs/puffs/Atffile
--- a/tests/fs/puffs/Atffile Tue Jul 13 21:12:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-Content-Type: application/X-atf-atffile; version="1"
-X-NetBSD-Id: "$NetBSD: Atffile,v 1.5 2007/12/30 09:13:32 jmmv Exp $"
-
-prop: test-suite = "NetBSD"
-
-tp-glob: t_*
diff -r c810fca24530 -r b9ab414db169 tests/fs/puffs/Makefile
--- a/tests/fs/puffs/Makefile Tue Jul 13 21:12:38 2010 +0000
+++ b/tests/fs/puffs/Makefile Tue Jul 13 21:13:21 2010 +0000
@@ -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>
diff -r c810fca24530 -r b9ab414db169 tests/fs/puffs/h_dtfs/Makefile
--- a/tests/fs/puffs/h_dtfs/Makefile Tue Jul 13 21:12:38 2010 +0000
+++ b/tests/fs/puffs/h_dtfs/Makefile Tue Jul 13 21:13:21 2010 +0000
@@ -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
diff -r c810fca24530 -r b9ab414db169 tests/fs/tmpfs/Atffile
--- a/tests/fs/tmpfs/Atffile Tue Jul 13 21:12:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-Content-Type: application/X-atf-atffile; version="1"
-X-NetBSD-Id: "$NetBSD: Atffile,v 1.6 2010/06/07 03:43:51 riz Exp $"
-
-prop: test-suite = "NetBSD"
-
-tp: t_mount
-tp: t_statvfs
-tp: t_mkdir
-tp: t_vnode_leak
-tp: t_setattr
-tp: t_rmdir
-tp: t_trail_slash
-tp: t_dots
-tp: t_create
-tp: t_remove
-tp: t_link
-tp: t_rename
-tp: t_read_write
-tp: t_exec
-tp: t_truncate
-tp: t_sizes
-tp: t_times
-tp: t_symlink
-tp: t_mknod
-tp: t_devices
-tp: t_pipes
-tp: t_sockets
-tp: t_readdir
-tp: t_vnd
-tp: t_renamerace
diff -r c810fca24530 -r b9ab414db169 tests/fs/umapfs/Atffile
--- a/tests/fs/umapfs/Atffile Tue Jul 13 21:12:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-Content-Type: application/X-atf-atffile; version="1"
-X-NetBSD-Id: "$NetBSD: Atffile,v 1.2 2010/03/31 18:40:26 njoly Exp $"
-
-prop: test-suite = "NetBSD"
-
-tp-glob: t_*
diff -r c810fca24530 -r b9ab414db169 tests/fs/union/Atffile
--- a/tests/fs/union/Atffile Tue Jul 13 21:12:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-Content-Type: application/X-atf-atffile; version="1"
-X-NetBSD-Id: "$NetBSD: Atffile,v 1.2 2010/03/31 18:40:26 njoly Exp $"
-
-prop: test-suite = "NetBSD"
-
-tp-glob: t_*
diff -r c810fca24530 -r b9ab414db169 tests/fs/vfs/Atffile
--- a/tests/fs/vfs/Atffile Tue Jul 13 21:12:38 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-Content-Type: application/X-atf-atffile; version="1"
Home |
Main Index |
Thread Index |
Old Index