d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor the test/ Makefiles after recent changes to bsd.test.mk (r289158) and

Browse Source 
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
This commit is contained in:
Enji Cooper 2015-10-12 08:16:03 +00:00
parent 4f4a7a03ce
commit b2d48be1bc
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=289172
121 changed files with 69 additions and 321 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/cat/tests/Makefile
View 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}

2
bin/date/tests/Makefile
View File

@ -2,8 +2,6 @@
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/bin/date
ATF_TESTS_SH= format_string_test
.include <bsd.test.mk>

6
bin/expr/tests/Makefile
View 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'

2
bin/ls/tests/Makefile
View 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

2
bin/mv/tests/Makefile
View File

@ -2,8 +2,6 @@
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/bin/mv
TAP_TESTS_SH= legacy_test
.include <bsd.test.mk>

2
bin/pax/tests/Makefile
View File

@ -2,8 +2,6 @@
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/bin/pax
TAP_TESTS_PERL= legacy_test
.include <bsd.test.mk>

2
bin/pkill/tests/Makefile
View 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

2
bin/sh/tests/Makefile
View File

@ -2,8 +2,6 @@
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/bin/sh
TESTS_SUBDIRS+= builtins
TESTS_SUBDIRS+= errors
TESTS_SUBDIRS+= execution

7
bin/sleep/tests/Makefile
View 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>

2
bin/test/tests/Makefile
View 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.

4
bin/tests/Makefile
View 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>

4
cddl/lib/tests/Makefile
View 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>

4
cddl/sbin/tests/Makefile
View 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>

4
cddl/tests/Makefile
View 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>

4
cddl/usr.bin/tests/Makefile
View 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>

3
cddl/usr.sbin/dtrace/tests/Makefile
View 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

4
cddl/usr.sbin/tests/Makefile
View 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>

4
gnu/lib/tests/Makefile
View 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>

4
gnu/tests/Makefile
View 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>

11
gnu/usr.bin/diff/tests/Makefile
View 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>

4
gnu/usr.bin/tests/Makefile
View 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>

3
lib/atf/libatf-c++/tests/Makefile
View 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

2
lib/atf/libatf-c++/tests/detail/Makefile
View 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"'

3
lib/atf/libatf-c/tests/Makefile
View 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

2
lib/atf/libatf-c/tests/detail/Makefile
View 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}"'

2
lib/atf/tests/Makefile
View File

@ -4,7 +4,7 @@
TESTSDIR= ${TESTSBASE}/lib/atf
.PATH: ${.CURDIR:H:H:H}/tests
.PATH: ${SRCTOP}/tests
KYUAFILE= yes
SUBDIR= test-programs

2
lib/atf/tests/test-programs/Makefile
View 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}

2
lib/libc/tests/Makefile
View File

@ -2,8 +2,6 @@
.include <src.opts.mk>
TESTSDIR= ${TESTSBASE}/lib/libc
SUBDIR= tls_dso
TESTS_SUBDIRS= c063

6
lib/libc/tests/Makefile.netbsd-tests
View 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>

2
lib/libc/tests/c063/Makefile
View File

@ -1,7 +1,5 @@
# $FreeBSD$
TESTSDIR= ${TESTSBASE}/lib/libc/c063
#TODO: t_o_search
NETBSD_ATF_TESTS_C= faccessat

2
lib/libc/tests/db/Makefile
View File

@ -1,7 +1,5 @@
# $FreeBSD$
TESTSDIR= ${TESTSBASE}/lib/libc/db
BINDIR= ${TESTSDIR}
PROGS= h_db

2
lib/libc/tests/gen/Makefile
View File

@ -2,8 +2,6 @@
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/lib/libc/gen
ATF_TESTS_C= arc4random_test
ATF_TESTS_C+= fpclassify2_test

6
lib/libc/tests/gen/execve/Makefile
View 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"

6
lib/libc/tests/gen/posix_spawn/Makefile
View 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

6
lib/libc/tests/hash/Makefile
View 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"

2
lib/libc/tests/inet/Makefile
View 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"

2
lib/libc/tests/locale/Makefile
View 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

2
lib/libc/tests/net/Makefile
View File

@ -2,8 +2,6 @@
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/lib/libc/net
BINDIR= ${TESTSDIR}
NETBSD_ATF_TESTS_C= getprotoent_test

4
lib/libc/tests/net/getaddrinfo/Makefile
View 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)"

2
lib/libc/tests/regex/Makefile
View 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

1
lib/libc/tests/rpc/Makefile
View 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

4
lib/libc/tests/setjmp/Makefile
View 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>

2
lib/libc/tests/ssp/Makefile
View File

@ -2,8 +2,6 @@
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/lib/libc/ssp
NO_WERROR=
WARNS?= 2

2
lib/libc/tests/stdio/Makefile
View File

@ -1,7 +1,5 @@
# $FreeBSD$
TESTSDIR= ${TESTSBASE}/lib/libc/stdio
ATF_TESTS_C= fmemopen2_test
NETBSD_ATF_TESTS_C= clearerr_test

2
lib/libc/tests/stdlib/Makefile
View 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

2
lib/libc/tests/string/Makefile
View File

@ -2,8 +2,6 @@
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/lib/libc/string
# TODO: popcount, stresep
NETBSD_ATF_TESTS_C+= memchr

2
lib/libc/tests/sys/Makefile
View 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

2
lib/libc/tests/termios/Makefile
View File

@ -2,8 +2,6 @@
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/lib/libc/termios
NETBSD_ATF_TESTS_C= tcsetpgrp_test
.include "../Makefile.netbsd-tests"

2
lib/libc/tests/time/Makefile
View 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

1
lib/libc/tests/tls/Makefile
View File

@ -2,7 +2,6 @@
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/lib/libc/tls
.if !defined(NO_PIC)
SUBDIR+= dso
.endif

1
lib/libc/tests/tls/dso/Makefile
View 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

2
lib/libc/tests/tls_dso/Makefile
View File

@ -1,5 +1,7 @@
# $FreeBSD$
SRCDIR= ${SRCTOP}/contrib/netbsd/
.include <bsd.own.mk>
LIB= h_tls_dynamic

2
lib/libc/tests/ttyio/Makefile
View File

@ -2,8 +2,6 @@
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/lib/libc/ttyio
# TODO: ptm_test
NETBSD_ATF_TESTS_C= ttyio_test

2
lib/libcrypt/tests/Makefile
View File

@ -2,8 +2,6 @@
# exercise libcrypt
TESTSDIR= ${TESTSBASE}/lib/libcrypt
ATF_TESTS_C= crypt_tests
CFLAGS+= -I${.CURDIR:H}

2
lib/libmp/tests/Makefile
View File

@ -1,7 +1,5 @@
# $FreeBSD$
TESTSDIR= ${TESTSBASE}/lib/libmp
TAP_TESTS_C+= legacy_test
LIBADD+= mp

2
lib/libnv/tests/Makefile
View File

@ -1,7 +1,5 @@
# $FreeBSD$
TESTSDIR= ${TESTSBASE}/lib/libnv
ATF_TESTS_CXX= \
dnv_tests \
nv_array_tests \

2
lib/libpam/libpam/tests/Makefile
View File

@ -1,6 +1,6 @@
# $FreeBSD$
OPENPAM = ${.CURDIR}/../../../../contrib/openpam
OPENPAM= ${SRCTOP}/contrib/openpam
.PATH: ${OPENPAM}/t
TESTSDIR = ${TESTSBASE}/lib/libpam

3
lib/libproc/tests/Makefile
View 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>

6
lib/librt/tests/Makefile
View 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

4
lib/libthr/tests/Makefile
View 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

2
lib/libthr/tests/dlopen/Makefile
View 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>

1
lib/libthr/tests/dlopen/dso/Makefile
View 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

2
lib/libutil/tests/Makefile
View 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

4
lib/msun/tests/Makefile
View 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

4
lib/tests/Makefile
View 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>

4
libexec/atf/atf-check/tests/Makefile
View 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

4
libexec/atf/atf-sh/tests/Makefile
View 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

4
libexec/atf/tests/Makefile
View 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>

1
libexec/rtld-elf/tests/Makefile
View File

@ -2,7 +2,6 @@
.include <bsd.own.mk>
TESTSDIR= ${TESTSBASE}/libexec/rtld-elf
SUBDIR+= libpythagoras target
ATF_TESTS_C= ld_library_pathfds

4
libexec/tests/Makefile
View 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>

2
sbin/devd/tests/Makefile
View 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"

2
sbin/dhclient/tests/Makefile
View File

@ -1,7 +1,5 @@
# $FreeBSD$
TESTSDIR= ${TESTSBASE}/sbin/dhclient
.PATH: ${.CURDIR}/..
PLAIN_TESTS_C= option-domain-search_test

2
sbin/growfs/tests/Makefile
View File

@ -1,7 +1,5 @@
# $FreeBSD$
TESTSDIR= ${TESTSBASE}/sbin/growfs
TAP_TESTS_PERL= legacy_test
.include <bsd.test.mk>

6
sbin/ifconfig/tests/Makefile
View 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>

3
sbin/mdconfig/tests/Makefile
View 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>

4
sbin/tests/Makefile
View 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>

4
secure/lib/tests/Makefile
View 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>

4
secure/libexec/tests/Makefile
View 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>

4
secure/tests/Makefile
View 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>

4
secure/usr.bin/tests/Makefile
View 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>

4
secure/usr.sbin/tests/Makefile
View 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>

4
share/examples/tests/Makefile
View 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>

2
share/tests/Makefile
View File

@ -4,7 +4,7 @@
TESTSDIR= ${TESTSBASE}/share
.PATH: ${.CURDIR:H:H}/tests
.PATH: ${SRCTOP}/tests
KYUAFILE= yes
.include <bsd.test.mk>

2
tests/etc/Makefile
View File

@ -4,7 +4,7 @@
TESTSDIR= ${TESTSBASE}/etc
.PATH: ${.CURDIR:H}
.PATH: ${SRCTOP}/tests
KYUAFILE= yes
SUBDIR+= rc.d

2
tests/sys/mqueue/Makefile
View 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

2
tests/sys/pjdfstest/tests/Makefile
View File

@ -1,6 +1,6 @@
# $FreeBSD$
PJDFSTEST_SRCDIR= ${.CURDIR:H:H:H:H}/contrib/pjdfstest
PJDFSTEST_SRCDIR= ${SRCTOP}/contrib/pjdfstest
TESTSDIR= ${TESTSBASE}/sys/pjdfstest

2
usr.bin/apply/tests/Makefile
View File

@ -1,7 +1,5 @@
# $FreeBSD$
TESTSDIR= ${TESTSBASE}/usr.bin/apply
TAP_TESTS_SH= legacy_test
FILESDIR= ${TESTSDIR}

9
usr.bin/basename/tests/Makefile
View 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>

2
usr.bin/calendar/tests/Makefile
View File

@ -1,7 +1,5 @@
# $FreeBSD$
TESTSDIR= ${TESTSBASE}/usr.bin/calendar
TAP_TESTS_SH= legacy_test
FILESDIR= ${TESTSDIR}

9
usr.bin/cmp/tests/Makefile
View 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>

2
usr.bin/col/tests/Makefile
View File

@ -1,7 +1,5 @@
# $FreeBSD$
TESTSDIR= ${TESTSBASE}/usr.bin/col
ATF_TESTS_SH= col
FILES= rlf.in \

2
usr.bin/comm/tests/Makefile
View File

@ -1,7 +1,5 @@
# $FreeBSD$
TESTSDIR= ${TESTSBASE}/usr.bin/comm
TAP_TESTS_SH= legacy_test
FILESDIR= ${TESTSDIR}

9
usr.bin/cut/tests/Makefile
View 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>

9
usr.bin/dirname/tests/Makefile
View 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>

2
usr.bin/file2c/tests/Makefile
View File

@ -1,7 +1,5 @@
# $FreeBSD$
TESTSDIR= ${TESTSBASE}/usr.bin/file2c
TAP_TESTS_SH= legacy_test
FILESDIR= ${TESTSDIR}

10
usr.bin/grep/tests/Makefile
View 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>

9
usr.bin/gzip/tests/Makefile
View 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>

2
usr.bin/ident/tests/Makefile
View File

@ -1,7 +1,5 @@
# $FreeBSD$
TESTSDIR= ${TESTSBASE}/usr.bin/ident
ATF_TESTS_SH= ident
FILES= test.in \
test.out \

2
usr.bin/join/tests/Makefile
View File

@ -1,7 +1,5 @@
# $FreeBSD$
TESTSDIR= ${TESTSBASE}/usr.bin/join
TAP_TESTS_SH= legacy_test
FILESDIR= ${TESTSDIR}

2
usr.bin/jot/tests/Makefile
View File

@ -1,7 +1,5 @@
# $FreeBSD$
TESTSDIR= ${TESTSBASE}/usr.bin/jot
TAP_TESTS_SH= legacy_test
FILESDIR= ${TESTSDIR}

Some files were not shown because too many files have changed in this diff Show More