]> xenbits.xensource.com Git - people/julieng/freebsd.git/commitdiff
Refactor the test/ Makefiles after recent changes to bsd.test.mk (r289158) and
authorngie <ngie@FreeBSD.org>
Mon, 12 Oct 2015 08:16:03 +0000 (08:16 +0000)
committerngie <ngie@FreeBSD.org>
Mon, 12 Oct 2015 08:16:03 +0000 (08:16 +0000)
netbsd-tests.test.mk (r289151)

- Eliminate explicit OBJTOP/SRCTOP setting
- Convert all ad hoc NetBSD test integration over to netbsd-tests.test.mk
- Remove unnecessary TESTSDIR setting
- Use SRCTOP where possible for clarity

MFC after: 2 weeks
Sponsored by: EMC / Isilon Storage Divison

121 files changed:
bin/cat/tests/Makefile
bin/date/tests/Makefile
bin/expr/tests/Makefile
bin/ls/tests/Makefile
bin/mv/tests/Makefile
bin/pax/tests/Makefile
bin/pkill/tests/Makefile
bin/sh/tests/Makefile
bin/sleep/tests/Makefile
bin/test/tests/Makefile
bin/tests/Makefile
cddl/lib/tests/Makefile
cddl/sbin/tests/Makefile
cddl/tests/Makefile
cddl/usr.bin/tests/Makefile
cddl/usr.sbin/dtrace/tests/Makefile
cddl/usr.sbin/tests/Makefile
gnu/lib/tests/Makefile
gnu/tests/Makefile
gnu/usr.bin/diff/tests/Makefile
gnu/usr.bin/tests/Makefile
lib/atf/libatf-c++/tests/Makefile
lib/atf/libatf-c++/tests/detail/Makefile
lib/atf/libatf-c/tests/Makefile
lib/atf/libatf-c/tests/detail/Makefile
lib/atf/tests/Makefile
lib/atf/tests/test-programs/Makefile
lib/libc/tests/Makefile
lib/libc/tests/Makefile.netbsd-tests
lib/libc/tests/c063/Makefile
lib/libc/tests/db/Makefile
lib/libc/tests/gen/Makefile
lib/libc/tests/gen/execve/Makefile
lib/libc/tests/gen/posix_spawn/Makefile
lib/libc/tests/hash/Makefile
lib/libc/tests/inet/Makefile
lib/libc/tests/locale/Makefile
lib/libc/tests/net/Makefile
lib/libc/tests/net/getaddrinfo/Makefile
lib/libc/tests/regex/Makefile
lib/libc/tests/rpc/Makefile
lib/libc/tests/setjmp/Makefile
lib/libc/tests/ssp/Makefile
lib/libc/tests/stdio/Makefile
lib/libc/tests/stdlib/Makefile
lib/libc/tests/string/Makefile
lib/libc/tests/sys/Makefile
lib/libc/tests/termios/Makefile
lib/libc/tests/time/Makefile
lib/libc/tests/tls/Makefile
lib/libc/tests/tls/dso/Makefile
lib/libc/tests/tls_dso/Makefile
lib/libc/tests/ttyio/Makefile
lib/libcrypt/tests/Makefile
lib/libmp/tests/Makefile
lib/libnv/tests/Makefile
lib/libpam/libpam/tests/Makefile
lib/libproc/tests/Makefile
lib/librt/tests/Makefile
lib/libthr/tests/Makefile
lib/libthr/tests/dlopen/Makefile
lib/libthr/tests/dlopen/dso/Makefile
lib/libutil/tests/Makefile
lib/msun/tests/Makefile
lib/tests/Makefile
libexec/atf/atf-check/tests/Makefile
libexec/atf/atf-sh/tests/Makefile
libexec/atf/tests/Makefile
libexec/rtld-elf/tests/Makefile
libexec/tests/Makefile
sbin/devd/tests/Makefile
sbin/dhclient/tests/Makefile
sbin/growfs/tests/Makefile
sbin/ifconfig/tests/Makefile
sbin/mdconfig/tests/Makefile
sbin/tests/Makefile
secure/lib/tests/Makefile
secure/libexec/tests/Makefile
secure/tests/Makefile
secure/usr.bin/tests/Makefile
secure/usr.sbin/tests/Makefile
share/examples/tests/Makefile
share/tests/Makefile
tests/etc/Makefile
tests/sys/mqueue/Makefile
tests/sys/pjdfstest/tests/Makefile
usr.bin/apply/tests/Makefile
usr.bin/basename/tests/Makefile
usr.bin/calendar/tests/Makefile
usr.bin/cmp/tests/Makefile
usr.bin/col/tests/Makefile
usr.bin/comm/tests/Makefile
usr.bin/cut/tests/Makefile
usr.bin/dirname/tests/Makefile
usr.bin/file2c/tests/Makefile
usr.bin/grep/tests/Makefile
usr.bin/gzip/tests/Makefile
usr.bin/ident/tests/Makefile
usr.bin/join/tests/Makefile
usr.bin/jot/tests/Makefile
usr.bin/lastcomm/tests/Makefile
usr.bin/m4/tests/Makefile
usr.bin/mkimg/tests/Makefile
usr.bin/ncal/tests/Makefile
usr.bin/printf/tests/Makefile
usr.bin/sed/tests/Makefile
usr.bin/soelim/tests/Makefile
usr.bin/tests/Makefile
usr.bin/truncate/tests/Makefile
usr.bin/units/tests/Makefile
usr.bin/uudecode/tests/Makefile
usr.bin/uuencode/tests/Makefile
usr.bin/xargs/tests/Makefile
usr.bin/yacc/tests/Makefile
usr.sbin/etcupdate/tests/Makefile
usr.sbin/fstyp/tests/Makefile
usr.sbin/newsyslog/tests/Makefile
usr.sbin/nmtree/tests/Makefile
usr.sbin/pw/tests/Makefile
usr.sbin/sa/tests/Makefile
usr.sbin/tests/Makefile

index 73f82e125d6f6e2083b181458c25f5281b217cf9..f68513ce683bace18c670c72e7bc5a0d1ef43633 100644 (file)
@@ -1,11 +1,5 @@
 # $FreeBSD$
 
-OBJTOP=                ${.OBJDIR}/../../..
-SRCTOP=                ${.CURDIR}/../../..
-TESTSRC=       ${SRCTOP}/contrib/netbsd-tests/bin/cat
-
-TESTSDIR=      ${TESTSBASE}/bin/cat
-
 NETBSD_ATF_TESTS_SH=           cat_test
 
 FILESDIR=      ${TESTSDIR}
index d023195b3289ae21cf4cdf5be09d3002d272822c..ecce803e247d3ee0318f8dfe2beae3f70e95fac6 100644 (file)
@@ -2,8 +2,6 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=      ${TESTSBASE}/bin/date
-
 ATF_TESTS_SH=  format_string_test
 
 .include <bsd.test.mk>
index 80c130c3df20f0fde54861e7ed764043663f73d4..21b0e993fedc7bb3b52cf1da10afac02afad1334 100644 (file)
@@ -1,11 +1,5 @@
 # $FreeBSD$
 
-OBJTOP=                ${.OBJDIR}/../../..
-SRCTOP=                ${.CURDIR}/../../..
-TESTSRC=       ${SRCTOP}/contrib/netbsd-tests/bin/expr
-
-TESTSDIR=      ${TESTSBASE}/bin/expr
-
 NETBSD_ATF_TESTS_SH=   expr_test
 
 ATF_TESTS_SH_SED_expr_test+=   -e 's/eval expr/eval expr --/g'
index ba8038c1ce93d382a6286269ed2927498fcbb0c2..89a2e8cf1dca7ae4a541fb8e233ca7b4ce788003 100644 (file)
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=      ${TESTSBASE}/bin/ls
-
 ATF_TESTS_SH+= ls_tests
 # This seems like overkill, but the idea in mind is that all of the testcases
 # should be runnable as !root
index 3d437ef916a6afcaddad34f8eca0ed4a3ced28f6..229d96e5766a5e63dc49522a818ec16d94201040 100644 (file)
@@ -2,8 +2,6 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=      ${TESTSBASE}/bin/mv
-
 TAP_TESTS_SH=  legacy_test
 
 .include <bsd.test.mk>
index 1f27c184130a89c9038118f915f87a1a8816cb4a..8334fea3c7471204b68a85c694786ef5c68f73ee 100644 (file)
@@ -2,8 +2,6 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=      ${TESTSBASE}/bin/pax
-
 TAP_TESTS_PERL=        legacy_test
 
 .include <bsd.test.mk>
index a4a2c915182fc90dd9ad98001d68b7f3221e3ac3..be467074651f63bd5cae5e3a8111234d0a232668 100644 (file)
@@ -2,8 +2,6 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=      ${TESTSBASE}/bin/pkill
-
 TAP_TESTS_SH=                  pgrep-F_test
 TAP_TESTS_SH+=                 pgrep-LF_test
 TAP_TESTS_SH+=                 pgrep-P_test
index c092962ae30349e912331785d047db71556447c6..d93e19aea7e144812bd637022c5550aee65f6e60 100644 (file)
@@ -2,8 +2,6 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=      ${TESTSBASE}/bin/sh
-
 TESTS_SUBDIRS+=        builtins
 TESTS_SUBDIRS+=        errors
 TESTS_SUBDIRS+=        execution
index 9b286e6ba9675750c21c6fe6556f09ab112bcef3..6fc95f39ccb11aa87f0a94c47336fb9458c04838 100644 (file)
@@ -1,12 +1,7 @@
 # $FreeBSD$
 
-TESTSRC=       ${.CURDIR}/../../../contrib/netbsd-tests/bin/sleep
-.PATH: ${TESTSRC}
-
 .include <bsd.own.mk>
 
-TESTSDIR=      ${TESTSBASE}/bin/sleep
-ATF_TESTS_SH=  sleep_test
-ATF_TESTS_SH_SRC_sleep_test=   t_sleep.sh
+NETBSD_ATF_TESTS_SH=   sleep_test
 
 .include <bsd.test.mk>
index 5ee337a213fb59b1fe0edec68d76535ce3d1f883..a1a5d4f02fa701d9dccab2b99443ccfe89caf18a 100644 (file)
@@ -2,8 +2,6 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=      ${TESTSBASE}/bin/test
-
 TAP_TESTS_SH=  legacy_test
 # Some tests in here are silently not run when the tests are executed as
 # root.  Explicitly tell Kyua to drop privileges.
index 7a59b1029513acc8e10abb38ff9e3faac5b31ae5..a0e63e5da42a4440ae2d9638059528fcd751227d 100644 (file)
@@ -2,9 +2,7 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=      ${TESTSBASE}/bin
-
-.PATH:         ${.CURDIR:H:H}/tests
+.PATH:         ${SRCTOP}/tests
 KYUAFILE=      yes
 
 .include <bsd.test.mk>
index 4a49d9fee849be9901867bc88a014a6af5bb40c2..a0e63e5da42a4440ae2d9638059528fcd751227d 100644 (file)
@@ -2,9 +2,7 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=      ${TESTSBASE}/cddl/lib
-
-.PATH:         ${.CURDIR:H:H:H}/tests
+.PATH:         ${SRCTOP}/tests
 KYUAFILE=      yes
 
 .include <bsd.test.mk>
index 91bbaee271f492b4336cf60bec412bcf9971b908..a0e63e5da42a4440ae2d9638059528fcd751227d 100644 (file)
@@ -2,9 +2,7 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=      ${TESTSBASE}/cddl/sbin
-
-.PATH:         ${.CURDIR:H:H:H}/tests
+.PATH:         ${SRCTOP}/tests
 KYUAFILE=      yes
 
 .include <bsd.test.mk>
index 34a27ea636a0b86e706bfe75d2106128803d3c69..a0e63e5da42a4440ae2d9638059528fcd751227d 100644 (file)
@@ -2,9 +2,7 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=      ${TESTSBASE}/cddl
-
-.PATH:         ${.CURDIR:H:H}/tests
+.PATH:         ${SRCTOP}/tests
 KYUAFILE=      yes
 
 .include <bsd.test.mk>
index c94d5910a210fffe4df75866464f087d81104147..a0e63e5da42a4440ae2d9638059528fcd751227d 100644 (file)
@@ -2,9 +2,7 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=      ${TESTSBASE}/cddl/usr.bin
-
-.PATH:         ${.CURDIR:H:H:H}/tests
+.PATH:         ${SRCTOP}/tests
 KYUAFILE=      yes
 
 .include <bsd.test.mk>
index dfd2b54e1e2c06513d6585be48e8bf81de8d6566..7db6f2fc0f7631b46cb34a9e9dd52f4dcfc420f6 100644 (file)
@@ -2,10 +2,9 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=      ${TESTSBASE}/cddl/usr.sbin/dtrace
 TESTS_SUBDIRS+=        common
 
-.PATH:         ${.CURDIR:H:H:H:H}/tests
+.PATH:         ${SRCTOP}/tests
 KYUAFILE=      YES
 
 .PATH:         ${.CURDIR}/tools
index 0305aeef1d3b7751249b98032cd5edaec8e330ae..a0e63e5da42a4440ae2d9638059528fcd751227d 100644 (file)
@@ -2,9 +2,7 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=      ${TESTSBASE}/cddl/usr.sbin
-
-.PATH:         ${.CURDIR:H:H:H}/tests
+.PATH:         ${SRCTOP}/tests
 KYUAFILE=      yes
 
 .include <bsd.test.mk>
index 256e24512e30b2e4f37fcad99713127c763b1b3c..a0e63e5da42a4440ae2d9638059528fcd751227d 100644 (file)
@@ -2,9 +2,7 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=      ${TESTSBASE}/gnu/lib
-
-.PATH:         ${.CURDIR:H:H:H}/tests
+.PATH:         ${SRCTOP}/tests
 KYUAFILE=      yes
 
 .include <bsd.test.mk>
index de42fae1ec0030d2ae8386059e6d8d88b17ded38..a0e63e5da42a4440ae2d9638059528fcd751227d 100644 (file)
@@ -2,9 +2,7 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=      ${TESTSBASE}/gnu
-
-.PATH:         ${.CURDIR:H:H}/tests
+.PATH:         ${SRCTOP}/tests
 KYUAFILE=      yes
 
 .include <bsd.test.mk>
index aa1629d33f537b7bdc831a04a1a5614058f9108c..16439b3b61fe12e52d7a90437a032ee19e23d756 100644 (file)
@@ -1,17 +1,14 @@
 # $FreeBSD$
 
-TESTSRC=       ${.CURDIR}/../../../../contrib/netbsd-tests/usr.bin/diff
-.PATH: ${TESTSRC}
+TESTSRC=       ${SRCTOP}/contrib/netbsd-tests/usr.bin/diff
 
-.include <bsd.own.mk>
-
-TESTSDIR=      ${TESTSBASE}/gnu/usr.bin/diff
-ATF_TESTS_SH=  diff_test
+NETBSD_ATF_TESTS_SH=   diff_test
 ATF_TESTS_SH_SED_diff_test=    -e 's/t_diff/`basename $$0`/g'
-ATF_TESTS_SH_SRC_diff_test=    t_diff.sh
 
 FILESDIR=      ${TESTSDIR}
 FILES+=                d_mallocv1.in
 FILES+=                d_mallocv2.in
 
+.include <netbsd-tests.test.mk>
+
 .include <bsd.test.mk>
index eebbff675d2e87b24cd57ff20dae18827c40a7c5..a0e63e5da42a4440ae2d9638059528fcd751227d 100644 (file)
@@ -2,9 +2,7 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=      ${TESTSBASE}/gnu/usr.bin
-
-.PATH:         ${.CURDIR:H:H:H}/tests
+.PATH:         ${SRCTOP}/tests
 KYUAFILE=      yes
 
 .include <bsd.test.mk>
index 5f5a57515bb2d811a4e92186e6009f5e5f372e12..a069bb19d1e600578716f6e238fe2f3b3615ca5a 100644 (file)
@@ -2,10 +2,9 @@
 
 .include <bsd.init.mk>
 
-TESTSDIR=      ${TESTSBASE}/lib/atf/libatf-c++
 TESTS_SUBDIRS= detail
 
-ATF=           ${.CURDIR:H:H:H:H}/contrib/atf
+ATF=           ${SRCTOP}/contrib/atf
 .PATH:         ${ATF}/atf-c++
 .PATH:         ${ATF}/atf-c++/detail
 
index 69c3e7bac0d0d1336e53697c5c886c3d61c3f613..f7d672e792fbc7ce4d203280dae83707d0759280 100644 (file)
@@ -4,7 +4,7 @@
 
 TESTSDIR=      ${TESTSBASE}/lib/atf/libatf-c++/detail
 
-ATF=           ${.CURDIR:H:H:H:H:H}/contrib/atf
+ATF=           ${SRCTOP}/contrib/atf
 .PATH:         ${ATF}/atf-c++/detail
 
 CFLAGS+=       -DATF_C_TESTS_BASE='"${TESTSBASE}/lib/atf/libatf-c"'
index d5b6dc07520cafb5fd2a3362bc2f9378cf797d8a..e864c2e8bafced21db4b9b6bc9c513afa6fcb28d 100644 (file)
@@ -2,10 +2,9 @@
 
 .include <bsd.init.mk>
 
-TESTSDIR=      ${TESTSBASE}/lib/atf/libatf-c
 TESTS_SUBDIRS= detail
 
-ATF=           ${.CURDIR:H:H:H:H}/contrib/atf
+ATF=           ${SRCTOP}/contrib/atf
 .PATH:         ${ATF}/atf-c
 .PATH:         ${ATF}/atf-c/detail
 
index 02c1f2b444d3ac332b4f236547dc7389c47b40b8..e47fd566ec0134f03d1069f1623abd7abb314e5e 100644 (file)
@@ -4,7 +4,7 @@
 
 TESTSDIR=      ${TESTSBASE}/lib/atf/libatf-c/detail
 
-ATF=           ${.CURDIR:H:H:H:H:H}/contrib/atf
+ATF=           ${SRCTOP}/contrib/atf
 .PATH:         ${ATF}/atf-c/detail
 
 CFLAGS+=       -DATF_INCLUDEDIR='"${INCLUDEDIR}"'
index 7bc96c94b039538832101e6d690e1ce569793715..dc79bb3491f5dbfea1bffeafcaf4fb07ff3d5ea1 100644 (file)
@@ -4,7 +4,7 @@
 
 TESTSDIR=      ${TESTSBASE}/lib/atf
 
-.PATH:         ${.CURDIR:H:H:H}/tests
+.PATH:         ${SRCTOP}/tests
 KYUAFILE=      yes
 
 SUBDIR=                test-programs
index b0c1c2376481497992b1c6f1085d8764f7c6774b..aa308268a04378613b56d16219242f56181921dd 100644 (file)
@@ -5,7 +5,7 @@
 TESTSDIR=      ${TESTSBASE}/lib/atf/test-programs
 KYUAFILE=      yes
 
-ATF=           ${.CURDIR:H:H:H:H}/contrib/atf
+ATF=           ${SRCTOP}/contrib/atf
 .PATH:         ${ATF}/test-programs
 
 CFLAGS+=       -I${ATF}
index 3036ce93f8ef5249c0c6e20f772396662ef2513c..2e97151836499b92ecf5be8051628752124c6661 100644 (file)
@@ -2,8 +2,6 @@
 
 .include <src.opts.mk>
 
-TESTSDIR=      ${TESTSBASE}/lib/libc
-
 SUBDIR=                tls_dso
 
 TESTS_SUBDIRS= c063
index f364b1c1b486c6b4f5747708f347e8c9504fddd4..32385186425fdfbbe616fdd684fb082cdda8fd0b 100644 (file)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
-OBJTOP?=       ${.OBJDIR:H:H:H:H}
-SRCTOP?=       ${.CURDIR:H:H:H:H}
-TESTSRC?=      ${SRCTOP}/contrib/netbsd-tests/lib/libc/${.CURDIR:T}
+TESTSRC:=      ${SRCTOP}/contrib/netbsd-tests/${RELDIR:C/libc\/tests/libc/}
+
+TESTSDIR:=     ${TESTSBASE}/${RELDIR:C/libc\/tests/libc/}
 
 .include <netbsd-tests.test.mk>
index 5f4e1ca9c31fd7c3dbf706789623a462352fad4c..2e4565cdf318a828f02061662a4036edc0958730 100644 (file)
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=      ${TESTSBASE}/lib/libc/c063
-
 #TODO: t_o_search
 
 NETBSD_ATF_TESTS_C=    faccessat
index ed1d6caadbf2f4ff1354f068ced26f8cdb59cf51..eb0ce395e28af60cb27106fae4d99550139ed28a 100644 (file)
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=      ${TESTSBASE}/lib/libc/db
-
 BINDIR=                ${TESTSDIR}
 
 PROGS=         h_db
index f9a0bd42b6dd65b3cf6faf0b57870716e5a848ca..90f65736c50892ddc8c8f8d54c8798e0afc3efec 100644 (file)
@@ -2,8 +2,6 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=      ${TESTSBASE}/lib/libc/gen
-
 ATF_TESTS_C=           arc4random_test
 ATF_TESTS_C+=          fpclassify2_test
 
index 2106a1582358b90ecfa4775863138ead9e5d380b..5e8bc6fb7640ba59ce82e920c528dac0dc53256c 100644 (file)
@@ -1,13 +1,7 @@
 # $FreeBSD$
 
-OBJTOP=                ${.OBJDIR:H:H:H:H:H}
-SRCTOP=                ${.CURDIR:H:H:H:H:H}
-TESTSRC=       ${SRCTOP}/contrib/netbsd-tests/lib/libc/gen/${.CURDIR:T}
-
 .include <bsd.own.mk>
 
-TESTSDIR=      ${TESTSBASE}/lib/libc/gen/execve
-
 NETBSD_ATF_TESTS_C=    execve_test
 
 .include "../../Makefile.netbsd-tests"
index f20bbd7c3e5faded4ffa682478244fd635cca7bf..9bb2cf1cbd57e31d40b84f2c17fe1b6a31b4829b 100644 (file)
@@ -1,13 +1,7 @@
 # $FreeBSD$
 
-OBJTOP=                ${.OBJDIR:H:H:H:H:H}
-SRCTOP=                ${.CURDIR:H:H:H:H:H}
-TESTSRC=       ${SRCTOP}/contrib/netbsd-tests/lib/libc/gen/${.CURDIR:T}
-
 .include <bsd.own.mk>
 
-TESTSDIR=      ${TESTSBASE}/lib/libc/gen/posix_spawn
-
 BINDIR=                ${TESTSDIR}
 
 NETBSD_ATF_TESTS_C=    fileactions_test
index 52fd569dfaaf8e67c84b2f3010ec0bcd34b44ecd..688725345fe6a7bb5350bbfe503ea00ed4e9551c 100644 (file)
@@ -2,8 +2,6 @@
 
 .include <src.opts.mk>
 
-TESTSDIR=      ${TESTSBASE}/lib/libc/hash
-
 NETBSD_ATF_TESTS_C=
 
 .if ${MK_OPENSSL} != "no"
@@ -29,8 +27,8 @@ LDADD+=               -lmd
 DPADD.sha2_test+=      ${LIBCRYPTO}
 LDADD.sha2_test+=      -lcrypto
 
-CFLAGS.sha2_test+=     -I${.CURDIR}/../../../../crypto/openssh/openbsd-compat
-CFLAGS.sha2_test+=     -I${.CURDIR}/../../../../crypto/openssh
+CFLAGS.sha2_test+=     -I${SRCTOP}/crypto/openssh/openbsd-compat
+CFLAGS.sha2_test+=     -I${SRCTOP}/crypto/openssh
 
 .include "../Makefile.netbsd-tests"
 
index a15b96ae35af80f1df0e979a6952c13df2ff4db9..ee6f98e2f71f71991b595f80952bdd8c68922002 100644 (file)
@@ -2,8 +2,6 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=      ${TESTSBASE}/lib/libc/inet
-
 NETBSD_ATF_TESTS_C=    inet_network_test
 
 .include "../Makefile.netbsd-tests"
index e4dc553c46ae8af78829c992e40cba496844b9b0..c0e037857d4cf34f81c37a182a821a6ec4c44f78 100644 (file)
@@ -2,8 +2,6 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=      ${TESTSBASE}/lib/libc/locale
-
 NETBSD_ATF_TESTS_C=    io_test
 NETBSD_ATF_TESTS_C+=   mbrtowc_test
 NETBSD_ATF_TESTS_C+=   mbstowcs_test
index eb199f09b8d75304766f0b1a553f7a88ca80db3c..5a0d77546752eeaa889919f67add4e8f1a48cbeb 100644 (file)
@@ -2,8 +2,6 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=      ${TESTSBASE}/lib/libc/net
-
 BINDIR=                ${TESTSDIR}
 
 NETBSD_ATF_TESTS_C=    getprotoent_test
index a6b9eb197e995e4ca52efac0d7dd379412076fe3..d21d3365594236c0a8a579554820b2e53b4744d6 100644 (file)
@@ -1,13 +1,9 @@
 # $FreeBSD$
 
-OBJTOP=                ${.OBJDIR:H:H:H:H:H}
-SRCTOP=                ${.CURDIR:H:H:H:H:H}
 TESTSRC=       ${SRCTOP}/contrib/netbsd-tests/lib/libc/net/${.CURDIR:T}
 
 .include <bsd.own.mk>
 
-TESTSDIR=      ${TESTSBASE}/lib/libc/net/getaddrinfo
-
 BINDIR=                ${TESTSDIR}
 
 .error "This testcase needs to be ported to FreeBSD (the output from getaddrinfo_test differs from NetBSD)"
index 37b3277e57c40fe6d195c2d059d0fee754a2f9b3..fa60f6ec4cc84a38255ca84faea1af6a189c9b85 100644 (file)
@@ -4,8 +4,6 @@
 
 BINDIR=                ${TESTSDIR}
 
-TESTSDIR=      ${TESTSBASE}/lib/libc/regex
-
 IMPLEMENTATION?=      -DREGEX_SPENCER
 
 CFLAGS.h_regex+=-I${TESTSRC} -I${.CURDIR:H:H}/regex
index 03802945cc6864298738495f63f411f7ad0c1fef..e6e58e76b905f0d9363b1b503f2bff7ea0cf2567 100644 (file)
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=              ${TESTSBASE}/lib/libc/rpc
 SRCS.xdr_test=         ${RPCSRC:.x=_xdr.c} t_xdr.c ${RPCSRC:.x=.h}
 
 NETBSD_ATF_TESTS_C=    rpc_test
index e4c7ae5144a63a15a124d5ff590728786edde435..0ca25774beef3b586edfbd6c978b3c9db6a88345 100644 (file)
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=      ${TESTSBASE}/lib/libc/setjmp
-
 NETBSD_ATF_TESTS_C=    t_setjmp
 NETBSD_ATF_TESTS_C+=   t_threadjmp
 
@@ -10,4 +8,6 @@ LDADD.t_threadjmp+= -lpthread
 
 WARNS?=        4
 
+.include "../Makefile.netbsd-tests"
+
 .include <bsd.test.mk>
index 7bc866035be0a7e0af85423cc4af1dc8d93dd09a..ec7a82a48885ec21265c653a4396202da13a3b53 100644 (file)
@@ -2,8 +2,6 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=      ${TESTSBASE}/lib/libc/ssp
-
 NO_WERROR=
 WARNS?=        2
 
index 23d5c1ef8664c4dda0b90b30ab0a9f8453c501b5..f2d686b52027f66eb30164fdeec564263c1aa922 100644 (file)
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=      ${TESTSBASE}/lib/libc/stdio
-
 ATF_TESTS_C=           fmemopen2_test
 
 NETBSD_ATF_TESTS_C=    clearerr_test
index 917160112f6a65b07d6d710b8db966cae0b28477..187ca5be9669821c2f33b0513abb8c8b78d660a1 100644 (file)
@@ -2,8 +2,6 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=      ${TESTSBASE}/lib/libc/stdlib
-
 # TODO: t_getenv_thread, t_mi_vector_hash
 NETBSD_ATF_TESTS_C=    abs_test
 NETBSD_ATF_TESTS_C+=   atoi_test
index 3c30ab67ec73a65df50bdf9e9e031b264d4cc0d4..d91af08a27f1b19ead8b69bbe941fed5f89ec74a 100644 (file)
@@ -2,8 +2,6 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=      ${TESTSBASE}/lib/libc/string
-
 # TODO: popcount, stresep
 
 NETBSD_ATF_TESTS_C+=   memchr
index 89431bced322c564769368f27a44e2bb34c1b2de..5cd596d077fbd274cd058404be8b546b487042e1 100644 (file)
@@ -2,8 +2,6 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=              ${TESTSBASE}/lib/libc/sys
-
 # TODO: clone, lwp_create, lwp_ctl, posix_fadvise, recvmmsg,
 # swapcontext
 NETBSD_ATF_TESTS_C+=           access_test
index 9a3fd66a5aacc2d04a8d3fd192ec6d2126725925..0495d684b505a17cf36e3d547c433102cadab400 100644 (file)
@@ -2,8 +2,6 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=      ${TESTSBASE}/lib/libc/termios
-
 NETBSD_ATF_TESTS_C=    tcsetpgrp_test
 
 .include "../Makefile.netbsd-tests"
index c2a55df15be5abaf1c8d6beb02d104a7a976223a..feb543dad24332a8dea84ce3435c9d94825a77a5 100644 (file)
@@ -2,8 +2,6 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=      ${TESTSBASE}/lib/libc/time
-
 NETBSD_ATF_TESTS_C=    mktime_test
 NETBSD_ATF_TESTS_C+=   strptime_test
 
index e2248959ab14979e44d95393ff46149c767a78d7..b6b671914e79c006316bf26cd2aafd871dd08d60 100644 (file)
@@ -2,7 +2,6 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=      ${TESTSBASE}/lib/libc/tls
 .if !defined(NO_PIC)
 SUBDIR+=       dso
 .endif
index 466f950061f82a130fe1c206633d0e15b2a11cad..9b698cd5f5c27211fea6ba9870d6acf46d7f400d 100644 (file)
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 OBJTOP=                ${.OBJDIR:H:H:H:H:H}
-SRCTOP=                ${.CURDIR:H:H:H:H:H}
 TESTSRC=       ${SRCTOP}/contrib/netbsd-tests/lib/libc/tls/${.CURDIR:T}
 
 LIB=           h_tls_dlopen
index 5449799de96c4105ffe6361be1e47d95e44b2204..b37ffec7665906fb88aded1308df52f42500481c 100644 (file)
@@ -1,5 +1,7 @@
 # $FreeBSD$
 
+SRCDIR=                ${SRCTOP}/contrib/netbsd/
+
 .include <bsd.own.mk>
 
 LIB=           h_tls_dynamic
index a1f320d6fd4d03a52b0ca75c6f95bd96491ba7fe..242f33258e41d1c68cb346c9af05c018114a7f53 100644 (file)
@@ -2,8 +2,6 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=      ${TESTSBASE}/lib/libc/ttyio
-
 # TODO: ptm_test
 NETBSD_ATF_TESTS_C=    ttyio_test
 
index 6f98b53a3437f583d893fc2cbf89a521dc43fe14..2591a3bf101483fa0c58a5aa3b530dabba1fdb35 100644 (file)
@@ -2,8 +2,6 @@
 
 # exercise libcrypt
 
-TESTSDIR= ${TESTSBASE}/lib/libcrypt
-
 ATF_TESTS_C= crypt_tests
 
 CFLAGS+= -I${.CURDIR:H}
index e74e80640e2018d5ba92beaee4f8dc08311eb1f9..42749d00a0392fc8c5e9db623a7245665406a2d1 100644 (file)
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=      ${TESTSBASE}/lib/libmp
-
 TAP_TESTS_C+=  legacy_test
 
 LIBADD+=       mp
index 38e7f13219a65745500abc62cac4e91e1c0ad564..cce0b5e8f1a76bf84cb7ddb6d0a1ffcf341ce05b 100644 (file)
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=      ${TESTSBASE}/lib/libnv
-
 ATF_TESTS_CXX= \
        dnv_tests \
        nv_array_tests \
index 4532aceee393a7fd03d2d7cf4adfe7542bb3ca89..e40936a883db265e3f100f7574aa50d73de2374a 100644 (file)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-OPENPAM = ${.CURDIR}/../../../../contrib/openpam
+OPENPAM=       ${SRCTOP}/contrib/openpam
 .PATH: ${OPENPAM}/t
 
 TESTSDIR = ${TESTSBASE}/lib/libpam
index 1f98467df24fc2ccea2e689e79f349e48a7f44b2..326481d572a9823385348fc6b889b0346f5eeb27 100644 (file)
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=      ${TESTSBASE}/lib/libproc
-
 ATF_TESTS_C+=  proc_test
 
 PROGS=         target_prog
@@ -15,7 +13,6 @@ DPADD+=       ${LIBELF} ${LIBPROC} ${LIBRTLD_DB} ${LIBUTIL}
 # for testing symbol lookup.
 STRIP=
 
-MAN=
 WARNS?=        6
 
 .include <bsd.test.mk>
index 95c525997e3b2333af1ed5c5404e5cc8c3fb270a..c4817ecfad764c322715654843d83fa80f5c1b47 100644 (file)
@@ -1,11 +1,5 @@
 # $FreeBSD$
 
-OBJTOP=                ${.OBJDIR:H:H:H}
-SRCTOP=                ${.CURDIR:H:H:H}
-TESTSRC=       ${SRCTOP}/contrib/netbsd-tests/lib/librt
-
-TESTSDIR=      ${TESTSBASE}/lib/librt
-
 LIBADD=        rt
 
 NETBSD_ATF_TESTS_C=    sched_test
index 11cf0e791e69339b417696d2451a7df5e97fee46..a5fc85eb67d116d7da5fa840bf912aaf5b251912 100644 (file)
@@ -1,11 +1,7 @@
 # $FreeBSD$
 
-OBJTOP=                ${.OBJDIR:H:H:H}
-SRCTOP=                ${.CURDIR:H:H:H}
 TESTSRC=       ${SRCTOP}/contrib/netbsd-tests/lib/libpthread
 
-TESTSDIR=      ${TESTSBASE}/lib/libthr
-
 # TODO: t_name (missing pthread_getname_np support in FreeBSD)
 NETBSD_ATF_TESTS_C=    barrier_test
 NETBSD_ATF_TESTS_C+=   cond_test
index 0764bfa1593628e1431860ddfca027e1ce3ba19e..08931924f21dd1ddad32c974e873a6f71fb3ef2d 100644 (file)
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-OBJTOP=                ${.OBJDIR:H:H:H:H}
-SRCTOP=                ${.CURDIR:H:H:H:H}
 TESTSRC=       ${SRCTOP}/contrib/netbsd-tests/lib/libpthread/dlopen
 
 .include <bsd.own.mk>
index 080dec941a8cf019620125a57ca2f705335502c8..533568766715e728e61a21c18977f3492bf9829c 100644 (file)
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 OBJTOP=                ${.OBJDIR:H:H:H:H:H}
-SRCTOP=                ${.CURDIR:H:H:H:H:H}
 TESTSRC=       ${SRCTOP}/contrib/netbsd-tests/lib/libpthread/dlopen/dso
 
 SHLIB=         h_pthread_dlopen
index 4a675b0cc18ff3f289d03566520b3c003cd4c6d9..81b2a494eaaef46a4fa5212392816a23ccaf9b42 100644 (file)
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=      ${TESTSBASE}/lib/libutil
-
 TAP_TESTS_C+=  flopen_test
 TAP_TESTS_C+=  grp_test
 TAP_TESTS_C+=  humanize_number_test
index 0479cfb638011c5360749c26aac8582a497fac99..7888c3c789f82ebeea65235674b9075f111ffc52 100644 (file)
@@ -1,11 +1,7 @@
 # $FreeBSD$
 
-OBJTOP=                ${.OBJDIR:H:H:H}
-SRCTOP=                ${.CURDIR:H:H:H}
 TESTSRC=       ${SRCTOP}/contrib/netbsd-tests/lib/libm
 
-TESTSDIR=      ${TESTSBASE}/lib/msun
-
 # All architectures on FreeBSD have fenv.h
 CFLAGS+=       -DHAVE_FENV_H
 
index 935fd709df02b7e34ad8006145348cd60c5dbd5c..a0e63e5da42a4440ae2d9638059528fcd751227d 100644 (file)
@@ -2,9 +2,7 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=      ${TESTSBASE}/lib
-
-.PATH:         ${.CURDIR:H:H}/tests
+.PATH:         ${SRCTOP}/tests
 KYUAFILE=      yes
 
 .include <bsd.test.mk>
index 43a74988a27b6ef34e3bd4d72b7e97ce3161c734..87b26cb4a82374426796a44798576766c181bfb0 100644 (file)
@@ -2,9 +2,7 @@
 
 .include <bsd.init.mk>
 
-TESTSDIR=      ${TESTSBASE}/libexec/atf/atf-check
-
-ATF=           ${.CURDIR:H:H:H:H}/contrib/atf
+ATF=           ${SRCTOP}/contrib/atf
 .PATH:         ${ATF}/atf-sh
 
 ATF_TESTS_SH=  atf-check_test
index 3360b974f9eeee3f6aa5e5d53d29f552a8aadbf3..9ccd6a7a44f116823ec030136cea51ca58dc2c1c 100644 (file)
@@ -2,9 +2,7 @@
 
 .include <bsd.init.mk>
 
-TESTSDIR=      ${TESTSBASE}/libexec/atf/atf-sh
-
-ATF=           ${.CURDIR:H:H:H:H}/contrib/atf
+ATF=           ${SRCTOP}/contrib/atf
 .PATH:         ${ATF}/atf-sh
 
 ATF_TESTS_SH+= atf_check_test
index 7aa96019367e69ba9ad1f7580d39a868cae43ca4..a0e63e5da42a4440ae2d9638059528fcd751227d 100644 (file)
@@ -2,9 +2,7 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=      ${TESTSBASE}/libexec/atf
-
-.PATH:         ${.CURDIR:H:H:H}/tests
+.PATH:         ${SRCTOP}/tests
 KYUAFILE=      yes
 
 .include <bsd.test.mk>
index f384218b1a596b86ae1779699479356d74a9ac5a..7d3be6837dcbc5bc51631f241ad40322cacd31d9 100644 (file)
@@ -2,7 +2,6 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=      ${TESTSBASE}/libexec/rtld-elf
 SUBDIR+=       libpythagoras target
 
 ATF_TESTS_C=   ld_library_pathfds
index 665efab4275e3b1e0c9a4b0f4a746b2b43f073ef..a0e63e5da42a4440ae2d9638059528fcd751227d 100644 (file)
@@ -2,9 +2,7 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=      ${TESTSBASE}/libexec
-
-.PATH:         ${.CURDIR:H:H}/tests
+.PATH:         ${SRCTOP}/tests
 KYUAFILE=      yes
 
 .include <bsd.test.mk>
index ee679ce722aebf2a91c274b92febc0282033f902..e06928c5571c63df3dbaf13fe3651547084e7f04 100644 (file)
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=      ${TESTSBASE}/sbin/devd
-
 ATF_TESTS_C=   client_test
 TEST_METADATA.client_test=     required_programs="devd"
 TEST_METADATA.client_test+=    required_user="root"
index a460f7f9be11ac0e8164b6e8ef8308fd54d01175..45cc8c28d4437f1e1bf59d1fe25adeba1a49c1e8 100644 (file)
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=      ${TESTSBASE}/sbin/dhclient
-
 .PATH: ${.CURDIR}/..
 
 PLAIN_TESTS_C=                         option-domain-search_test
index 7a6a831f20374d19eea1cb56f0ee31fe1e6c1c64..6a3208d9c4415d0a03d0282cd23f39abfbe893b0 100644 (file)
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=      ${TESTSBASE}/sbin/growfs
-
 TAP_TESTS_PERL=        legacy_test
 
 .include <bsd.test.mk>
index 044e9792d35221fc5e64e97f7ddb3e610760992b..93967c7051753eeb42bdb9a569c69aa6a4344336 100644 (file)
@@ -1,11 +1,5 @@
 # $FreeBSD$
 
-OBJTOP=                ${.OBJDIR}/../../..
-SRCTOP=                ${.CURDIR}/../../..
-TESTSRC=       ${SRCTOP}/contrib/netbsd-tests/sbin/ifconfig
-
-TESTSDIR=      ${TESTSBASE}/sbin/ifconfig
-
 NETBSD_ATF_TESTS_SH=           nonexistent_test
 
 .include <netbsd-tests.test.mk>
index 08a9e47e90dc0766a555f9f62e6fed230c15320b..6c179fcf59ad207f591f19e83c61e5f5287eb3a8 100644 (file)
@@ -1,10 +1,7 @@
 # $FreeBSD$
 
-TESTSDIR=      ${TESTSBASE}/sbin/mdconfig
-
 ATF_TESTS_SH=  mdconfig_test
 
-
 TEST_METADATA.mdconfig_test+=  required_user="root"
 
 .include <bsd.test.mk>
index a298f87ab432c3706dca8d89530e4333c5333022..a0e63e5da42a4440ae2d9638059528fcd751227d 100644 (file)
@@ -2,9 +2,7 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=      ${TESTSBASE}/sbin
-
-.PATH:         ${.CURDIR:H:H}/tests
+.PATH:         ${SRCTOP}/tests
 KYUAFILE=      yes
 
 .include <bsd.test.mk>
index cd6bcff5f3c92c23f1368f8555a275bf33cc5b6b..a0e63e5da42a4440ae2d9638059528fcd751227d 100644 (file)
@@ -2,9 +2,7 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=      ${TESTSBASE}/secure/lib
-
-.PATH:         ${.CURDIR:H:H:H}/tests
+.PATH:         ${SRCTOP}/tests
 KYUAFILE=      yes
 
 .include <bsd.test.mk>
index 6debef892a59c18f33db6abf6e415c8c2d7f9eb7..a0e63e5da42a4440ae2d9638059528fcd751227d 100644 (file)
@@ -2,9 +2,7 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=      ${TESTSBASE}/secure/libexec
-
-.PATH:         ${.CURDIR:H:H:H}/tests
+.PATH:         ${SRCTOP}/tests
 KYUAFILE=      yes
 
 .include <bsd.test.mk>
index 2e6dbc487fdc22bc6cb79b6b471832d3c8267ea2..a0e63e5da42a4440ae2d9638059528fcd751227d 100644 (file)
@@ -2,9 +2,7 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=      ${TESTSBASE}/secure
-
-.PATH:         ${.CURDIR:H:H}/tests
+.PATH:         ${SRCTOP}/tests
 KYUAFILE=      yes
 
 .include <bsd.test.mk>
index 1c06699c587a8a709e952ef04aa4c0703d895dad..a0e63e5da42a4440ae2d9638059528fcd751227d 100644 (file)
@@ -2,9 +2,7 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=      ${TESTSBASE}/secure/usr.bin
-
-.PATH:         ${.CURDIR:H:H:H}/tests
+.PATH:         ${SRCTOP}/tests
 KYUAFILE=      yes
 
 .include <bsd.test.mk>
index 25e95f03cdea768df8138cdb384baf5a3ea3d76d..a0e63e5da42a4440ae2d9638059528fcd751227d 100644 (file)
@@ -2,9 +2,7 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=      ${TESTSBASE}/secure/usr.sbin
-
-.PATH:         ${.CURDIR:H:H:H}/tests
+.PATH:         ${SRCTOP}/tests
 KYUAFILE=      yes
 
 .include <bsd.test.mk>
index 387b8068b1f77b598aad25d44adaf8d98920fc3c..a091b2d2f68eb71880867de96bfabf9486daa0a5 100644 (file)
@@ -2,11 +2,9 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=      ${TESTSBASE}/share/examples
-
 SUBDIR=                tests
 
+.PATH:         ${SRCTOP}/tests
 KYUAFILE=      yes
-.PATH:         ${.CURDIR:H:H:H}/tests
 
 .include <bsd.test.mk>
index 2c6362193ab7469ab8b3fbe32b0b152f43f4a009..e070571ecb4b78fa54a196b4d6ad92942dd6afb2 100644 (file)
@@ -4,7 +4,7 @@
 
 TESTSDIR=      ${TESTSBASE}/share
 
-.PATH:         ${.CURDIR:H:H}/tests
+.PATH:         ${SRCTOP}/tests
 KYUAFILE=      yes
 
 .include <bsd.test.mk>
index 9aad25c0639590d1abcfd89946f21267dfba70ea..1e49666767c0185615f64cca4745ec6435fd4cbc 100644 (file)
@@ -4,7 +4,7 @@
 
 TESTSDIR=      ${TESTSBASE}/etc
 
-.PATH:         ${.CURDIR:H}
+.PATH:         ${SRCTOP}/tests
 KYUAFILE=      yes
 
 SUBDIR+=       rc.d
index 5af8b2546a092eb5c40a11ab9a605ab798435447..63741d26b77e6d8e6f9168f6b4cee329f25c0edf 100644 (file)
@@ -6,7 +6,7 @@ ATF_TESTS_SH=   mqueue_test
 
 BINDIR=                ${TESTSDIR}
 
-CFLAGS+=       -I${.CURDIR:H:H}
+CFLAGS+=       -I${SRCTOP}/tests
 
 PROGS+=                mqtest1
 PROGS+=                mqtest2
index 248b2095a6b7b622eabe26190e7695cdcb575ba5..95b4bbe29b41f3deb3057a52051eb65cc3c6f450 100644 (file)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-PJDFSTEST_SRCDIR=      ${.CURDIR:H:H:H:H}/contrib/pjdfstest
+PJDFSTEST_SRCDIR=      ${SRCTOP}/contrib/pjdfstest
 
 TESTSDIR=      ${TESTSBASE}/sys/pjdfstest
 
index 332bf7db169c342bf36ed3705734f1598f5f8db6..5ff6c28e968ec0f2169c67ffd41e68555cca5484 100644 (file)
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=      ${TESTSBASE}/usr.bin/apply
-
 TAP_TESTS_SH=  legacy_test
 
 FILESDIR=      ${TESTSDIR}
index 32dedabc5f4d48eb465633ba0431b0ce62d650fd..bad7b28904321179a2db2d7e1fb091a45a76164f 100644 (file)
@@ -1,12 +1,7 @@
 # $FreeBSD$
 
-TESTSRC=       ${.CURDIR}/../../../contrib/netbsd-tests/usr.bin/basename
-.PATH: ${TESTSRC}
+NETBSD_ATF_TESTS_SH=   basename_test
 
-.include <bsd.own.mk>
-
-TESTSDIR=      ${TESTSBASE}/usr.bin/basename
-ATF_TESTS_SH=  basename_test
-ATF_TESTS_SH_SRC_basename_test=        t_basename.sh
+.include <netbsd-tests.test.mk>
 
 .include <bsd.test.mk>
index f3d592e4280262b42ff0b96b443d36a16677f808..b9b0607f20b8f961ceb0100c4f4b1dd9133de5f0 100644 (file)
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=      ${TESTSBASE}/usr.bin/calendar
-
 TAP_TESTS_SH=  legacy_test
 
 FILESDIR=      ${TESTSDIR}
index 1c054c6888f8f5214481141a83daefd6e381daad..bfae46c8a2a423d1f2c77251ba378d522fe260ed 100644 (file)
@@ -1,12 +1,9 @@
 # $FreeBSD$
 
-TESTSRC=       ${.CURDIR}/../../../contrib/netbsd-tests/usr.bin/cmp
-.PATH: ${TESTSRC}
-
 .include <bsd.own.mk>
 
-TESTSDIR=      ${TESTSBASE}/usr.bin/cmp
-ATF_TESTS_SH=  cmp_test
-ATF_TESTS_SH_SRC_cmp_test=     t_cmp.sh
+NETBSD_ATF_TESTS_SH=   cmp_test
+
+.include <netbsd-tests.test.mk>
 
 .include <bsd.test.mk>
index 43838e9c5eab79e1e3d195cb6c49124d0b2492ca..cf02083d7f017e10ceb144a0cc9fe1c23b4c8d99 100644 (file)
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=      ${TESTSBASE}/usr.bin/col
-
 ATF_TESTS_SH=  col
 
 FILES=         rlf.in \
index 172943d1247c09cd075aab485957874bbc65a498..065b3b4f6020ff1062e04d52e6c1e35e4870ba03 100644 (file)
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=      ${TESTSBASE}/usr.bin/comm
-
 TAP_TESTS_SH=  legacy_test
 
 FILESDIR=      ${TESTSDIR}
index b324a7804196c4e8da8d1a61f783650258b3cf08..7d8707d0e79cb2c2ce4d55855618084c2ded5d50 100644 (file)
@@ -1,13 +1,8 @@
 # $FreeBSD$
 
-TESTSRC=       ${.CURDIR}/../../../contrib/netbsd-tests/usr.bin/cut
-.PATH: ${TESTSRC}
-
 .include <bsd.own.mk>
 
-TESTSDIR=      ${TESTSBASE}/usr.bin/cut
-ATF_TESTS_SH=  cut_test
-ATF_TESTS_SH_SRC_cut_test=     t_cut.sh
+NETBSD_ATF_TESTS_SH=   cut_test
 
 FILESDIR=      ${TESTSDIR}
 FILES=         d_basic.out
@@ -18,4 +13,6 @@ FILES+=               d_latin1.in
 FILES+=                d_sflag.out
 FILES+=                d_utf8.in
 
+.include <netbsd-tests.test.mk>
+
 .include <bsd.test.mk>
index 5b84c57092feae6d3b0f1e8df10baa93d9cbeeeb..6688e0d18ecdd2dd5d10cbece6b217a2b9b5be9e 100644 (file)
@@ -1,12 +1,9 @@
 # $FreeBSD$
 
-TESTSRC=       ${.CURDIR}/../../../contrib/netbsd-tests/usr.bin/dirname
-.PATH: ${TESTSRC}
-
 .include <bsd.own.mk>
 
-TESTSDIR=      ${TESTSBASE}/usr.bin/dirname
-ATF_TESTS_SH=  dirname_test
-ATF_TESTS_SH_SRC_dirname_test= t_dirname.sh
+NETBSD_ATF_TESTS_SH=   dirname_test
+
+.include <netbsd-tests.test.mk>
 
 .include <bsd.test.mk>
index 8854eb4da47760025eb0463e7ff47f1fd8a82b40..50267f0fa5c3bb3eae6095ffdfdfa10ee92903bd 100644 (file)
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=      ${TESTSBASE}/usr.bin/file2c
-
 TAP_TESTS_SH=  legacy_test
 
 FILESDIR=      ${TESTSDIR}
index 59b948c98e5a7dc73dcdd2858fd8e8026cc8f09d..7744fcbd2e4904d8a26d56645db72b58a7aa736a 100644 (file)
@@ -1,14 +1,8 @@
 # $FreeBSD$
 
-TESTSRC=       ${.CURDIR}/../../../contrib/netbsd-tests/usr.bin/grep
-.PATH: ${TESTSRC}
-
 .include <bsd.own.mk>
 
-TESTSDIR=      ${TESTSBASE}/usr.bin/grep
-
-ATF_TESTS_SH=  grep_test
-ATF_TESTS_SH_SRC_grep_test=    t_grep.sh
+NETBSD_ATF_TESTS_SH=   grep_test
 
 FILESDIR=      ${TESTSDIR}
 FILES=         d_basic.out
@@ -38,4 +32,6 @@ FILES+=               d_whole_line.out
 FILES+=                d_word_regexps.out
 FILES+=                d_zgrep.out
 
+.include <netbsd-tests.test.mk>
+
 .include <bsd.test.mk>
index 155d739f17bd5ea00fe08a2b81f7b8ec0c50e427..03a5852b3ff000991c264ef5bea74a5d43c1fbe3 100644 (file)
@@ -1,12 +1,9 @@
 # $FreeBSD$
 
-TESTSRC=       ${.CURDIR}/../../../contrib/netbsd-tests/usr.bin/gzip
-.PATH: ${TESTSRC}
-
 .include <bsd.own.mk>
 
-TESTSDIR=      ${TESTSBASE}/usr.bin/gzip
-ATF_TESTS_SH=  gzip_test
-ATF_TESTS_SH_SRC_gzip_test=    t_gzip.sh
+NETBSD_ATF_TESTS_SH=   gzip_test
+
+.include <netbsd-tests.test.mk>
 
 .include <bsd.test.mk>
index cc29bb8c6f8e6d4f4916d4ec5447297b3bf466d0..2ae27cf13cdfa64e1bc32beb5861af11f273e20a 100644 (file)
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=      ${TESTSBASE}/usr.bin/ident
-
 ATF_TESTS_SH=  ident
 FILES=         test.in \
                test.out \
index 2d5580ff76d629ca0256c9f77446dec950c9e176..16f522fa4ca28e370cd1152568c1f14116291c51 100644 (file)
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=      ${TESTSBASE}/usr.bin/join
-
 TAP_TESTS_SH=  legacy_test
 
 FILESDIR=      ${TESTSDIR}
index ef20eb24c755f10ff0c4df92b29dadcdea0dd4d2..63f76313ab8bec83de28d4226c3191b1852f1cdd 100644 (file)
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=      ${TESTSBASE}/usr.bin/jot
-
 TAP_TESTS_SH=  legacy_test
 
 FILESDIR=      ${TESTSDIR}
index b0fac0e4aa16260f321adf796fa1c02b2f7a7091..55ce574f67947c36ed562497de3dbe5facbae8e1 100644 (file)
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=      ${TESTSBASE}/usr.bin/lastcomm
-
 TAP_TESTS_SH=  legacy_test
 
 FILESDIR=      ${TESTSDIR}
index 2eebc07894b93e2cdde7789a7f2d531ab6c49467..6a48677894faeac747b5375035ae6672c97ca613 100644 (file)
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=      ${TESTSBASE}/usr.bin/m4
-
 TAP_TESTS_SH=  legacy_test
 
 FILESDIR=      ${TESTSDIR}
index 144b4fc83ae39e2212dfb177d384e5b430664bb3..c2c6d5134750e69f43ee208184fa34c1202c52ec 100644 (file)
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=      ${TESTSBASE}/usr.bin/mkimg
-
 ATF_TESTS_SH=  mkimg
 
 SOURCES!=      cd ${.CURDIR}; echo *.uu
index 170caacf8a9775bc2988e592fbc3d9c760bfd8bb..23b235fc777028842accee634cf6ad56ae4830a4 100644 (file)
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=      ${TESTSBASE}/usr.bin/ncal
-
 TAP_TESTS_SH=  legacy_test
 
 FILESDIR=      ${TESTSDIR}
index 5e212efb40f1972c70d5de42e2fc700bb1733ca2..58c80c7a222d3cd0adfe6f47bb6059ff86d33af2 100644 (file)
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=      ${TESTSBASE}/usr.bin/printf
-
 TAP_TESTS_SH=  legacy_test
 
 FILESDIR=      ${TESTSDIR}
index 02d2b89404bff1473c5c189fb003fc9df433c76f..a23d4a9b858d0d44a6e87b621ef6913211ed06e8 100644 (file)
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=      ${TESTSBASE}/usr.bin/sed
-
 TAP_TESTS_SH=  legacy_test
 TAP_TESTS_SH+= multi_test
 TEST_METADATA.multi_test+=     required_files="/usr/share/dict/words"
index 4d787cfadc35d0833a5a201b82c7a27a63fa5d73..7c44d080ac5c4dcbf057cb7e732e314172f997b2 100644 (file)
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=      ${TESTSBASE}/usr.bin/soelim
-
 ATF_TESTS_SH=  soelim
 
 FILES=         nonexisting.in \
index af7a8bf9544d70b82b25cce841dc1b2499114797..08b47bca0f1aad39df87bfb7679dfe74970c8fc0 100644 (file)
@@ -2,9 +2,7 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=      ${TESTSBASE}/usr.bin
-
-.PATH:         ${.CURDIR:H:H}/tests
+.PATH:         ${SRCTOP}/tests
 KYUAFILE=      yes
 
 FILESDIR=      ${TESTSDIR}
index bfa15db114bcc770d06c1cf8bd19881edcc62b1c..82cd606e6d1be6b7807fbc8de77b2034e5a533f0 100644 (file)
@@ -1,6 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=      ${TESTSBASE}/usr.bin/truncate
-ATF_TESTS_SH=  truncate_test 
+ATF_TESTS_SH=  truncate_test
 
 .include <bsd.test.mk>
index 0694effd12a86d3b9d481ec2ad2f179a8392d1b9..5b135f7dbf1f119fd3af8a891f6ceef346e94486 100644 (file)
@@ -2,8 +2,6 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=      ${TESTSBASE}/usr.bin/units
-
 TAP_TESTS_SH=  basics_test
 
 .include <bsd.test.mk>
index 5fda16bc49eae3860940ad752dc1263c98fcf1e7..efd3f927784591df64b3fa6188ce286f67c60f5f 100644 (file)
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=      ${TESTSBASE}/usr.bin/uudecode
-
 TAP_TESTS_SH=  legacy_test
 
 FILESDIR=      ${TESTSDIR}
index ca7088e34c636f42ebf03f5c26234922b8a8ba73..a36ef6c9b088ad0aa591cb0100ce00a7838a6bba 100644 (file)
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=      ${TESTSBASE}/usr.bin/uuencode
-
 TAP_TESTS_SH=  legacy_test
 
 FILESDIR=      ${TESTSDIR}
index cd14813aedc91a5ac059fcd7de1849a7824d45ad..c8ef2c951ae9f2aff5a92afc196018edeea1865c 100644 (file)
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=      ${TESTSBASE}/usr.bin/xargs
-
 TAP_TESTS_SH=  legacy_test
 
 FILESDIR=      ${TESTSDIR}
index 2e157ec61319d72ce961c5530e49ce47390cc79c..ad3abaac20d84578d1974cfb39f31ebd037199c3 100644 (file)
@@ -2,12 +2,10 @@
 
 .include <bsd.own.mk>
 
-TEST_DIR=      ${.CURDIR}/../../../contrib/byacc/test
+TEST_DIR=      ${SRCTOP}/contrib/byacc/test
 
 .PATH: ${TEST_DIR} ${TEST_DIR}/yacc
 
-TESTSDIR=      ${TESTSBASE}/usr.bin/yacc
-
 PLAIN_TESTS_SH=        yacc_tests
 # NOTE: due to caveats with how permissions are handled on FreeBSD
 # with root, this must be run as a non-privileged user; otherwise
index da83397e61ff7084c31ef4fd62edb940f06fe891..45b12b7bb75d5c968223aa1c515fb9623eae9b50 100644 (file)
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=      ${TESTSBASE}/usr.sbin/etcupdate
-
 PLAIN_TESTS_SH=
 .for test in   always_test \
                conflicts_test \
index db686b59c3147b1f361f65aefcd3196cdccc5fea..01c98699e2a03eb7b1784dbe0cf1bfb84974357d 100644 (file)
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=      ${TESTSBASE}/usr.sbin/fstyp
-
 ATF_TESTS_SH=  fstyp_test
 
 FILES= ext2.img.bz2
index f8ad2739cd7849f83f44edcb15fbe26ea6897e6e..802a44c010126e7b5ea9c9173c76059150e63c55 100644 (file)
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=      ${TESTSBASE}/usr.sbin/newsyslog
-
 TAP_TESTS_SH=  legacy_test
 
 .include <bsd.test.mk>
index 1df81d0f0a44276bc16d64d9e73ae0ccfda02ffb..0b6312723162e77db434c41745413b10ca276c1d 100644 (file)
@@ -1,10 +1,8 @@
 # $FreeBSD$
 
-TESTSRC=       ${.CURDIR}/../../../contrib/netbsd-tests/usr.sbin/mtree
+TESTSRC=       ${SRCTOP}/contrib/netbsd-tests/usr.sbin/mtree
 .PATH: ${TESTSRC}
 
-TESTSDIR=      ${TESTSBASE}/usr.sbin/nmtree
-
 ATF_TESTS_SH=  nmtree_test
 ATF_TESTS_SH_SRC_nmtree_test=  t_mtree.sh
 
index a1605aadaf5790b579890ee8f2b171ce273e2d49..27f0ac44eca0b80ce8853f247ae46d4257718beb 100644 (file)
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=      ${TESTSBASE}/usr.sbin/pw
-
 ATF_TESTS_SH=  pw_etcdir \
                pw_lock \
                pw_config \
index 204b510945150f1b7f6431f83749f71a97bc4a60..3c74ba97d67364274c51c1669ca6e1dbabc548a1 100644 (file)
@@ -1,7 +1,5 @@
 # $FreeBSD$
 
-TESTSDIR=      ${TESTSBASE}/usr.sbin/sa
-
 TAP_TESTS_SH=  legacy_test
 
 FILESDIR=      ${TESTSDIR}
index a7e9c7140f7064b9494a41725fdfad63f1462764..a0e63e5da42a4440ae2d9638059528fcd751227d 100644 (file)
@@ -2,9 +2,7 @@
 
 .include <bsd.own.mk>
 
-TESTSDIR=      ${TESTSBASE}/usr.sbin
-
-.PATH:         ${.CURDIR:H:H}/tests
+.PATH:         ${SRCTOP}/tests
 KYUAFILE=      yes
 
 .include <bsd.test.mk>