Index: head/bin/cat/tests/Makefile =================================================================== --- head/bin/cat/tests/Makefile (revision 289171) +++ head/bin/cat/tests/Makefile (revision 289172) @@ -1,18 +1,12 @@ # $FreeBSD$ -OBJTOP= ${.OBJDIR}/../../.. -SRCTOP= ${.CURDIR}/../../.. -TESTSRC= ${SRCTOP}/contrib/netbsd-tests/bin/cat - -TESTSDIR= ${TESTSBASE}/bin/cat - NETBSD_ATF_TESTS_SH= cat_test FILESDIR= ${TESTSDIR} FILES= d_align.in FILES+= d_align.out .include .include Index: head/bin/date/tests/Makefile =================================================================== --- head/bin/date/tests/Makefile (revision 289171) +++ head/bin/date/tests/Makefile (revision 289172) @@ -1,9 +1,7 @@ # $FreeBSD$ .include -TESTSDIR= ${TESTSBASE}/bin/date - ATF_TESTS_SH= format_string_test .include Index: head/bin/expr/tests/Makefile =================================================================== --- head/bin/expr/tests/Makefile (revision 289171) +++ head/bin/expr/tests/Makefile (revision 289172) @@ -1,16 +1,10 @@ # $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' ATF_TESTS_SH_SED_expr_test+= -e 's/"expr: integer overflow or underflow occurred for operation.*"/"expr: overflow"/g' .include .include Index: head/bin/ls/tests/Makefile =================================================================== --- head/bin/ls/tests/Makefile (revision 289171) +++ head/bin/ls/tests/Makefile (revision 289172) @@ -1,11 +1,9 @@ # $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 TEST_METADATA.ls_tests+= required_user="unprivileged" TEST_METADATA.ls_tests+= required_files="/usr/bin/awk /usr/bin/nc /usr/bin/sort" .include Index: head/bin/mv/tests/Makefile =================================================================== --- head/bin/mv/tests/Makefile (revision 289171) +++ head/bin/mv/tests/Makefile (revision 289172) @@ -1,9 +1,7 @@ # $FreeBSD$ .include -TESTSDIR= ${TESTSBASE}/bin/mv - TAP_TESTS_SH= legacy_test .include Index: head/bin/pax/tests/Makefile =================================================================== --- head/bin/pax/tests/Makefile (revision 289171) +++ head/bin/pax/tests/Makefile (revision 289172) @@ -1,9 +1,7 @@ # $FreeBSD$ .include -TESTSDIR= ${TESTSBASE}/bin/pax - TAP_TESTS_PERL= legacy_test .include Index: head/bin/pkill/tests/Makefile =================================================================== --- head/bin/pkill/tests/Makefile (revision 289171) +++ head/bin/pkill/tests/Makefile (revision 289172) @@ -1,40 +1,38 @@ # $FreeBSD$ .include -TESTSDIR= ${TESTSBASE}/bin/pkill - TAP_TESTS_SH= pgrep-F_test TAP_TESTS_SH+= pgrep-LF_test TAP_TESTS_SH+= pgrep-P_test TAP_TESTS_SH+= pgrep-U_test TAP_TESTS_SH+= pgrep-_g_test TAP_TESTS_SH+= pgrep-_s_test TAP_TESTS_SH+= pgrep-g_test TAP_TESTS_SH+= pgrep-i_test TAP_TESTS_SH+= pgrep-j_test TEST_METADATA.pgrep-j_test+= required_user="root" TEST_METADATA.pgrep-j_test+= required_programs="jail jls" TAP_TESTS_SH+= pgrep-l_test TAP_TESTS_SH+= pgrep-n_test TAP_TESTS_SH+= pgrep-o_test TAP_TESTS_SH+= pgrep-q_test TAP_TESTS_SH+= pgrep-s_test TAP_TESTS_SH+= pgrep-t_test TAP_TESTS_SH+= pgrep-v_test TAP_TESTS_SH+= pgrep-x_test TAP_TESTS_SH+= pkill-F_test TAP_TESTS_SH+= pkill-LF_test TAP_TESTS_SH+= pkill-P_test TAP_TESTS_SH+= pkill-U_test TAP_TESTS_SH+= pkill-_g_test TAP_TESTS_SH+= pkill-g_test TAP_TESTS_SH+= pkill-i_test TAP_TESTS_SH+= pkill-j_test TEST_METADATA.pkill-j_test+= required_user="root" TEST_METADATA.pkill-j_test+= required_programs="jail jls" TAP_TESTS_SH+= pkill-s_test TAP_TESTS_SH+= pkill-t_test TAP_TESTS_SH+= pkill-x_test .include Index: head/bin/sh/tests/Makefile =================================================================== --- head/bin/sh/tests/Makefile (revision 289171) +++ head/bin/sh/tests/Makefile (revision 289172) @@ -1,15 +1,13 @@ # $FreeBSD$ .include -TESTSDIR= ${TESTSBASE}/bin/sh - TESTS_SUBDIRS+= builtins TESTS_SUBDIRS+= errors TESTS_SUBDIRS+= execution TESTS_SUBDIRS+= expansion TESTS_SUBDIRS+= parameters TESTS_SUBDIRS+= parser TESTS_SUBDIRS+= set-e .include Index: head/bin/sleep/tests/Makefile =================================================================== --- head/bin/sleep/tests/Makefile (revision 289171) +++ head/bin/sleep/tests/Makefile (revision 289172) @@ -1,12 +1,7 @@ # $FreeBSD$ -TESTSRC= ${.CURDIR}/../../../contrib/netbsd-tests/bin/sleep -.PATH: ${TESTSRC} - .include -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 Index: head/bin/test/tests/Makefile =================================================================== --- head/bin/test/tests/Makefile (revision 289171) +++ head/bin/test/tests/Makefile (revision 289172) @@ -1,15 +1,13 @@ # $FreeBSD$ .include -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. # # TODO(jmmv): Kyua needs to do this by default, not only when explicitly # requested. See https://code.google.com/p/kyua/issues/detail?id=6 TEST_METADATA.legacy_test+= required_user="unprivileged" .include Index: head/bin/tests/Makefile =================================================================== --- head/bin/tests/Makefile (revision 289171) +++ head/bin/tests/Makefile (revision 289172) @@ -1,10 +1,8 @@ # $FreeBSD$ .include -TESTSDIR= ${TESTSBASE}/bin - -.PATH: ${.CURDIR:H:H}/tests +.PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/cddl/lib/tests/Makefile =================================================================== --- head/cddl/lib/tests/Makefile (revision 289171) +++ head/cddl/lib/tests/Makefile (revision 289172) @@ -1,10 +1,8 @@ # $FreeBSD$ .include -TESTSDIR= ${TESTSBASE}/cddl/lib - -.PATH: ${.CURDIR:H:H:H}/tests +.PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/cddl/sbin/tests/Makefile =================================================================== --- head/cddl/sbin/tests/Makefile (revision 289171) +++ head/cddl/sbin/tests/Makefile (revision 289172) @@ -1,10 +1,8 @@ # $FreeBSD$ .include -TESTSDIR= ${TESTSBASE}/cddl/sbin - -.PATH: ${.CURDIR:H:H:H}/tests +.PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/cddl/tests/Makefile =================================================================== --- head/cddl/tests/Makefile (revision 289171) +++ head/cddl/tests/Makefile (revision 289172) @@ -1,10 +1,8 @@ # $FreeBSD$ .include -TESTSDIR= ${TESTSBASE}/cddl - -.PATH: ${.CURDIR:H:H}/tests +.PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/cddl/usr.bin/tests/Makefile =================================================================== --- head/cddl/usr.bin/tests/Makefile (revision 289171) +++ head/cddl/usr.bin/tests/Makefile (revision 289172) @@ -1,10 +1,8 @@ # $FreeBSD$ .include -TESTSDIR= ${TESTSBASE}/cddl/usr.bin - -.PATH: ${.CURDIR:H:H:H}/tests +.PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/cddl/usr.sbin/dtrace/tests/Makefile =================================================================== --- head/cddl/usr.sbin/dtrace/tests/Makefile (revision 289171) +++ head/cddl/usr.sbin/dtrace/tests/Makefile (revision 289172) @@ -1,15 +1,14 @@ # $FreeBSD$ .include -TESTSDIR= ${TESTSBASE}/cddl/usr.sbin/dtrace TESTS_SUBDIRS+= common -.PATH: ${.CURDIR:H:H:H:H}/tests +.PATH: ${SRCTOP}/tests KYUAFILE= YES .PATH: ${.CURDIR}/tools SCRIPTSDIR= ${TESTSDIR} SCRIPTS= dtest.sh .include Index: head/cddl/usr.sbin/tests/Makefile =================================================================== --- head/cddl/usr.sbin/tests/Makefile (revision 289171) +++ head/cddl/usr.sbin/tests/Makefile (revision 289172) @@ -1,10 +1,8 @@ # $FreeBSD$ .include -TESTSDIR= ${TESTSBASE}/cddl/usr.sbin - -.PATH: ${.CURDIR:H:H:H}/tests +.PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/gnu/lib/tests/Makefile =================================================================== --- head/gnu/lib/tests/Makefile (revision 289171) +++ head/gnu/lib/tests/Makefile (revision 289172) @@ -1,10 +1,8 @@ # $FreeBSD$ .include -TESTSDIR= ${TESTSBASE}/gnu/lib - -.PATH: ${.CURDIR:H:H:H}/tests +.PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/gnu/tests/Makefile =================================================================== --- head/gnu/tests/Makefile (revision 289171) +++ head/gnu/tests/Makefile (revision 289172) @@ -1,10 +1,8 @@ # $FreeBSD$ .include -TESTSDIR= ${TESTSBASE}/gnu - -.PATH: ${.CURDIR:H:H}/tests +.PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/gnu/usr.bin/diff/tests/Makefile =================================================================== --- head/gnu/usr.bin/diff/tests/Makefile (revision 289171) +++ head/gnu/usr.bin/diff/tests/Makefile (revision 289172) @@ -1,17 +1,14 @@ # $FreeBSD$ -TESTSRC= ${.CURDIR}/../../../../contrib/netbsd-tests/usr.bin/diff -.PATH: ${TESTSRC} +TESTSRC= ${SRCTOP}/contrib/netbsd-tests/usr.bin/diff -.include - -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 .include Index: head/gnu/usr.bin/tests/Makefile =================================================================== --- head/gnu/usr.bin/tests/Makefile (revision 289171) +++ head/gnu/usr.bin/tests/Makefile (revision 289172) @@ -1,10 +1,8 @@ # $FreeBSD$ .include -TESTSDIR= ${TESTSBASE}/gnu/usr.bin - -.PATH: ${.CURDIR:H:H:H}/tests +.PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/lib/atf/libatf-c/tests/Makefile =================================================================== --- head/lib/atf/libatf-c/tests/Makefile (revision 289171) +++ head/lib/atf/libatf-c/tests/Makefile (revision 289172) @@ -1,36 +1,35 @@ # $FreeBSD$ .include -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 CFLAGS+= -DATF_INCLUDEDIR='"${INCLUDEDIR}"' CFLAGS+= -I${ATF} # macros_test.c contains a double 'const const' which will be gone with # the import of atf-0.18. # TODO(jmmv): Remove this workaround once we do that update. CFLAGS.clang+= -Wno-duplicate-decl-specifier FILESDIR= ${TESTSDIR} FILES= macros_h_test.c FILES+= unused_test.c .for _T in atf_c_test \ build_test \ check_test \ error_test \ macros_test \ tc_test \ tp_test \ utils_test ATF_TESTS_C+= ${_T} SRCS.${_T}= ${_T}.c test_helpers.c .endfor .include Index: head/lib/atf/libatf-c/tests/detail/Makefile =================================================================== --- head/lib/atf/libatf-c/tests/detail/Makefile (revision 289171) +++ head/lib/atf/libatf-c/tests/detail/Makefile (revision 289172) @@ -1,35 +1,35 @@ # $FreeBSD$ .include 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}"' CFLAGS+= -I${ATF} .for _T in dynstr_test \ env_test \ fs_test \ list_test \ map_test \ process_test \ sanity_test \ text_test \ user_test ATF_TESTS_C+= ${_T} SRCS.${_T}= ${_T}.c test_helpers.c .endfor .for p in process_helpers version_helper PROGS+= ${p} SRCS.${p}= ${p}.c MAN.${p}= # defined BINDIR.${p}= ${TESTSDIR} .endfor version_helper.o: atf-version .include "../../../common.mk" .include Index: head/lib/atf/libatf-c++/tests/Makefile =================================================================== --- head/lib/atf/libatf-c++/tests/Makefile (revision 289171) +++ head/lib/atf/libatf-c++/tests/Makefile (revision 289172) @@ -1,30 +1,29 @@ # $FreeBSD$ .include -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 CFLAGS+= -DATF_C_TESTS_BASE='"${TESTSBASE}/lib/atf/libatf-c"' CFLAGS+= -DATF_INCLUDEDIR='"${INCLUDEDIR}"' CFLAGS+= -I${ATF} FILESDIR= ${TESTSDIR} FILES= macros_hpp_test.cpp FILES+= unused_test.cpp .for _T in atf_c++_test \ build_test \ check_test \ macros_test \ tests_test \ utils_test ATF_TESTS_CXX+= ${_T} SRCS.${_T}= ${_T}.cpp test_helpers.cpp .endfor .include Index: head/lib/atf/libatf-c++/tests/detail/Makefile =================================================================== --- head/lib/atf/libatf-c++/tests/detail/Makefile (revision 289171) +++ head/lib/atf/libatf-c++/tests/detail/Makefile (revision 289172) @@ -1,33 +1,33 @@ # $FreeBSD$ .include 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"' CFLAGS+= -DATF_INCLUDEDIR='"${INCLUDEDIR}"' CFLAGS+= -I${ATF} .for _T in application_test \ env_test \ exceptions_test \ fs_test \ process_test \ text_test ATF_TESTS_CXX+= ${_T} SRCS.${_T}= ${_T}.cpp test_helpers.cpp .endfor .for p in version_helper PROGS_CXX+= ${p} SRCS.${p}= ${p}.cpp MAN.${p}= # defined BINDIR.${p}= ${TESTSDIR} .endfor version_helper.o: atf-version .include "../../../common.mk" .include Index: head/lib/atf/tests/Makefile =================================================================== --- head/lib/atf/tests/Makefile (revision 289171) +++ head/lib/atf/tests/Makefile (revision 289172) @@ -1,12 +1,12 @@ # $FreeBSD$ .include TESTSDIR= ${TESTSBASE}/lib/atf -.PATH: ${.CURDIR:H:H:H}/tests +.PATH: ${SRCTOP}/tests KYUAFILE= yes SUBDIR= test-programs .include Index: head/lib/atf/tests/test-programs/Makefile =================================================================== --- head/lib/atf/tests/test-programs/Makefile (revision 289171) +++ head/lib/atf/tests/test-programs/Makefile (revision 289172) @@ -1,24 +1,24 @@ # $FreeBSD$ .include 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} ATF_TESTS_C= c_helpers ATF_TESTS_CXX= cpp_helpers SRCS.cpp_helpers= cpp_helpers.cpp ATF_TESTS_SH= sh_helpers .for _T in config_test expect_test meta_data_test result_test srcdir_test ATF_TESTS_SH+= ${_T} ATF_TESTS_SH_SRC_${_T}= common.sh ${_T}.sh .endfor .include Index: head/lib/libc/tests/Makefile =================================================================== --- head/lib/libc/tests/Makefile (revision 289171) +++ head/lib/libc/tests/Makefile (revision 289172) @@ -1,32 +1,30 @@ # $FreeBSD$ .include -TESTSDIR= ${TESTSBASE}/lib/libc - SUBDIR= tls_dso TESTS_SUBDIRS= c063 TESTS_SUBDIRS+= db TESTS_SUBDIRS+= gen TESTS_SUBDIRS+= hash TESTS_SUBDIRS+= inet TESTS_SUBDIRS+= net TESTS_SUBDIRS+= regex TESTS_SUBDIRS+= stdio TESTS_SUBDIRS+= stdlib TESTS_SUBDIRS+= string TESTS_SUBDIRS+= sys TESTS_SUBDIRS+= termios TESTS_SUBDIRS+= tls TESTS_SUBDIRS+= ttyio .if ${MK_LOCALES} != "no" TESTS_SUBDIRS+= locale .endif .if ${MK_SSP} != "no" TESTS_SUBDIRS+= ssp .endif .include Index: head/lib/libc/tests/Makefile.netbsd-tests =================================================================== --- head/lib/libc/tests/Makefile.netbsd-tests (revision 289171) +++ head/lib/libc/tests/Makefile.netbsd-tests (revision 289172) @@ -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 Index: head/lib/libc/tests/c063/Makefile =================================================================== --- head/lib/libc/tests/c063/Makefile (revision 289171) +++ head/lib/libc/tests/c063/Makefile (revision 289172) @@ -1,27 +1,25 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/lib/libc/c063 - #TODO: t_o_search NETBSD_ATF_TESTS_C= faccessat NETBSD_ATF_TESTS_C+= fchmodat NETBSD_ATF_TESTS_C+= fchownat NETBSD_ATF_TESTS_C+= fexecve NETBSD_ATF_TESTS_C+= fstatat NETBSD_ATF_TESTS_C+= linkat NETBSD_ATF_TESTS_C+= mkdirat NETBSD_ATF_TESTS_C+= mkfifoat NETBSD_ATF_TESTS_C+= mknodat NETBSD_ATF_TESTS_C+= openat NETBSD_ATF_TESTS_C+= readlinkat NETBSD_ATF_TESTS_C+= renameat NETBSD_ATF_TESTS_C+= symlinkat NETBSD_ATF_TESTS_C+= unlinkat NETBSD_ATF_TESTS_C+= utimensat CFLAGS+= -D_INCOMPLETE_XOPEN_C063 .include "../Makefile.netbsd-tests" .include Index: head/lib/libc/tests/db/Makefile =================================================================== --- head/lib/libc/tests/db/Makefile (revision 289171) +++ head/lib/libc/tests/db/Makefile (revision 289172) @@ -1,18 +1,16 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/lib/libc/db - BINDIR= ${TESTSDIR} PROGS= h_db FILESDIR= ${TESTSDIR} FILES= README NETBSD_ATF_TESTS_SH+= db_test ATF_TESTS_SH_SED_db_test= -e 's,/bin/csh,/bin/cat,g' .include "../Makefile.netbsd-tests" .include Index: head/lib/libc/tests/gen/Makefile =================================================================== --- head/lib/libc/tests/gen/Makefile (revision 289171) +++ head/lib/libc/tests/gen/Makefile (revision 289172) @@ -1,61 +1,59 @@ # $FreeBSD$ .include -TESTSDIR= ${TESTSBASE}/lib/libc/gen - ATF_TESTS_C= arc4random_test ATF_TESTS_C+= fpclassify2_test # TODO: t_closefrom, t_cpuset, t_fmtcheck, t_randomid, t_sleep # TODO: t_siginfo (fixes require further inspection) # TODO: t_sethostname_test (consistently screws up the hostname) NETBSD_ATF_TESTS_C= alarm_test NETBSD_ATF_TESTS_C+= assert_test NETBSD_ATF_TESTS_C+= basedirname_test NETBSD_ATF_TESTS_C+= dir_test NETBSD_ATF_TESTS_C+= floatunditf_test NETBSD_ATF_TESTS_C+= fnmatch_test NETBSD_ATF_TESTS_C+= fpclassify_test NETBSD_ATF_TESTS_C+= fpsetmask_test NETBSD_ATF_TESTS_C+= fpsetround_test NETBSD_ATF_TESTS_C+= ftok_test NETBSD_ATF_TESTS_C+= getcwd_test NETBSD_ATF_TESTS_C+= getgrent_test NETBSD_ATF_TESTS_C+= glob_test NETBSD_ATF_TESTS_C+= humanize_number_test NETBSD_ATF_TESTS_C+= isnan_test NETBSD_ATF_TESTS_C+= nice_test NETBSD_ATF_TESTS_C+= pause_test NETBSD_ATF_TESTS_C+= raise_test NETBSD_ATF_TESTS_C+= realpath_test NETBSD_ATF_TESTS_C+= setdomainname_test NETBSD_ATF_TESTS_C+= sethostname_test NETBSD_ATF_TESTS_C+= sleep_test NETBSD_ATF_TESTS_C+= syslog_test NETBSD_ATF_TESTS_C+= time_test NETBSD_ATF_TESTS_C+= ttyname_test NETBSD_ATF_TESTS_C+= vis_test .include "../Makefile.netbsd-tests" LDADD.humanize_number_test+= -lutil DPADD.humanize_number_test+= ${LIBUTIL} LDADD.fpclassify_test+= -lm DPADD.fpclassify_test+= ${LIBM} LDADD.fpsetround_test+= -lm DPADD.fpsetround_test+= ${LIBM} LDADD.siginfo_test+= -lm DPADD.siginfo_test+= ${LIBM} LDADD.nice_test+= -lpthread DPADD.nice_test+= ${LIBPTHREAD} LDADD.syslog_test+= -lpthread DPADD.syslog_test+= ${LIBPTHREAD} TESTS_SUBDIRS= execve TESTS_SUBDIRS+= posix_spawn .include Index: head/lib/libc/tests/gen/execve/Makefile =================================================================== --- head/lib/libc/tests/gen/execve/Makefile (revision 289171) +++ head/lib/libc/tests/gen/execve/Makefile (revision 289172) @@ -1,15 +1,9 @@ # $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 - -TESTSDIR= ${TESTSBASE}/lib/libc/gen/execve NETBSD_ATF_TESTS_C= execve_test .include "../../Makefile.netbsd-tests" .include Index: head/lib/libc/tests/gen/posix_spawn/Makefile =================================================================== --- head/lib/libc/tests/gen/posix_spawn/Makefile (revision 289171) +++ head/lib/libc/tests/gen/posix_spawn/Makefile (revision 289172) @@ -1,36 +1,30 @@ # $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 - -TESTSDIR= ${TESTSBASE}/lib/libc/gen/posix_spawn BINDIR= ${TESTSDIR} NETBSD_ATF_TESTS_C= fileactions_test NETBSD_ATF_TESTS_C+= spawn_test NETBSD_ATF_TESTS_C+= spawnattr_test PROGS= h_fileactions PROGS+= h_spawn PROGS+= h_spawnattr SCRIPTS= h_nonexec SCRIPTS+= h_zero CLEANFILES+= h_nonexec .include "../../Makefile.netbsd-tests" h_zero: dd if=/dev/zero of=h_zero bs=1k count=2 chmod a+x h_zero CLEANFILES+= h_zero WARNS?=3 .include Index: head/lib/libc/tests/hash/Makefile =================================================================== --- head/lib/libc/tests/hash/Makefile (revision 289171) +++ head/lib/libc/tests/hash/Makefile (revision 289172) @@ -1,37 +1,35 @@ # $FreeBSD$ .include -TESTSDIR= ${TESTSBASE}/lib/libc/hash - NETBSD_ATF_TESTS_C= .if ${MK_OPENSSL} != "no" NETBSD_ATF_TESTS_C+= sha2_test .endif NETBSD_ATF_TESTS_SH= hash_test BINDIR= ${TESTSDIR} PROGS+= h_hash FILESDIR= ${TESTSDIR}/data FILES+= data/md5test-in FILES+= data/md5test-out FILES+= data/sha1test-in FILES+= data/sha1test-out FILES+= data/sha1test2-out DPADD+= ${LIBMD} 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" .include Index: head/lib/libc/tests/inet/Makefile =================================================================== --- head/lib/libc/tests/inet/Makefile (revision 289171) +++ head/lib/libc/tests/inet/Makefile (revision 289172) @@ -1,11 +1,9 @@ # $FreeBSD$ .include -TESTSDIR= ${TESTSBASE}/lib/libc/inet - NETBSD_ATF_TESTS_C= inet_network_test .include "../Makefile.netbsd-tests" .include Index: head/lib/libc/tests/locale/Makefile =================================================================== --- head/lib/libc/tests/locale/Makefile (revision 289171) +++ head/lib/libc/tests/locale/Makefile (revision 289172) @@ -1,22 +1,20 @@ # $FreeBSD$ .include -TESTSDIR= ${TESTSBASE}/lib/libc/locale - NETBSD_ATF_TESTS_C= io_test NETBSD_ATF_TESTS_C+= mbrtowc_test NETBSD_ATF_TESTS_C+= mbstowcs_test NETBSD_ATF_TESTS_C+= mbsnrtowcs_test NETBSD_ATF_TESTS_C+= mbtowc_test NETBSD_ATF_TESTS_C+= wcscspn_test NETBSD_ATF_TESTS_C+= wcspbrk_test NETBSD_ATF_TESTS_C+= wcsspn_test NETBSD_ATF_TESTS_C+= wcstod_test NETBSD_ATF_TESTS_C+= wctomb_test CFLAGS.t_wctomb.c+= -Wno-stack-protector .include "../Makefile.netbsd-tests" .include Index: head/lib/libc/tests/net/Makefile =================================================================== --- head/lib/libc/tests/net/Makefile (revision 289171) +++ head/lib/libc/tests/net/Makefile (revision 289172) @@ -1,39 +1,37 @@ # $FreeBSD$ .include -TESTSDIR= ${TESTSBASE}/lib/libc/net - BINDIR= ${TESTSDIR} NETBSD_ATF_TESTS_C= getprotoent_test NETBSD_ATF_TESTS_C+= ether_aton_test SRCS.t_ether_aton= aton_ether_subr.c t_ether_aton.c aton_ether_subr.c: gen_ether_subr ${.CURDIR:H:H:H:H}/sys/net/if_ethersubr.c ${HOST_SH} ${.ALLSRC} ${.TARGET} # TODO: hostent_test NETBSD_ATF_TESTS_SH= nsdispatch_test NETBSD_ATF_TESTS_SH+= protoent_test NETBSD_ATF_TESTS_SH+= servent_test PROGS= h_nsd_recurse PROGS+= h_protoent PROGS+= h_servent PROGS+= h_dns_server DPADD.h_nsd_recurse+= ${LIBPTHREAD} LDADD.h_nsd_recurse+= -lpthread CLEANFILES+= aton_ether_subr.c .include "../Makefile.netbsd-tests" # TODO: the testcases needs to be ported to FreeBSD #TESTS_SUBDIRS= getaddrinfo FILES= hosts FILES+= resolv.conf .include Index: head/lib/libc/tests/net/getaddrinfo/Makefile =================================================================== --- head/lib/libc/tests/net/getaddrinfo/Makefile (revision 289171) +++ head/lib/libc/tests/net/getaddrinfo/Makefile (revision 289172) @@ -1,31 +1,27 @@ # $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 - -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)" NETBSD_ATF_TESTS_SH= getaddrinfo_test PROGS= h_gai FILESDIR= ${TESTSDIR}/data FILES= basics_v4.exp basics_v4v6.exp FILES+= no_host_v4.exp no_host_v4v6.exp FILES+= no_serv_v4.exp no_serv_v4v6.exp FILES+= sock_raw_v4.exp sock_raw_v4v6.exp FILES+= spec_fam_v4.exp spec_fam_v4v6.exp FILES+= scoped.exp FILES+= unsup_fam.exp .include "../../Makefile.netbsd-tests" .include Index: head/lib/libc/tests/regex/Makefile =================================================================== --- head/lib/libc/tests/regex/Makefile (revision 289171) +++ head/lib/libc/tests/regex/Makefile (revision 289172) @@ -1,59 +1,57 @@ # $FreeBSD$ .include BINDIR= ${TESTSDIR} -TESTSDIR= ${TESTSBASE}/lib/libc/regex - IMPLEMENTATION?= -DREGEX_SPENCER CFLAGS.h_regex+=-I${TESTSRC} -I${.CURDIR:H:H}/regex PROGS+= h_regex SRCS.h_regex= main.c split.c debug.c NETBSD_ATF_TESTS_SH= regex_test FILESDIR= ${TESTSDIR}/data FILES+= README FILES+= data/anchor.in FILES+= data/backref.in FILES+= data/basic.in FILES+= data/bracket.in FILES+= data/c_comments.in FILES+= data/complex.in FILES+= data/error.in FILES+= data/meta.in FILES+= data/nospec.in FILES+= data/paren.in FILES+= data/regress.in FILES+= data/repet_bounded.in FILES+= data/repet_multi.in FILES+= data/repet_ordinary.in FILES+= data/startend.in FILES+= data/subexp.in FILES+= data/subtle.in FILES+= data/word_bound.in FILES+= data/zero.in #FILES+= data/att/README FILES+= data/att/basic.dat FILES+= data/att/categorization.dat FILES+= data/att/forcedassoc.dat FILES+= data/att/leftassoc.dat FILES+= data/att/nullsubexpr.dat FILES+= data/att/repetition.dat FILES+= data/att/rightassoc.dat NETBSD_ATF_TESTS_C= exhaust_test NETBSD_ATF_TESTS_C+= regex_att_test .for t in ${NETBSD_ATF_TESTS_C} CFLAGS.$t+= -I${TESTSRC} ${IMPLEMENTATION} .endfor .include "../Makefile.netbsd-tests" DPADD.regex_att_test+= ${LIBUTIL} LDADD.regex_att_test+= -lutil .include Index: head/lib/libc/tests/rpc/Makefile =================================================================== --- head/lib/libc/tests/rpc/Makefile (revision 289171) +++ head/lib/libc/tests/rpc/Makefile (revision 289172) @@ -1,27 +1,26 @@ # $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 NETBSD_ATF_TESTS_C+= xdr_test RPCSRC= h_testbits.x RPCGEN= RPCGEN_CPP=${CPP:Q} rpcgen -L -C h_testbits.h: ${RPCSRC} ${RPCGEN} -h -o ${.TARGET} ${.ALLSRC} h_testbits_xdr.c: ${RPCSRC} h_testbits.h ${RPCGEN} ${.ALLSRC:M*.x} CLEANFILES+= ${RPCSRC:.x=.h} ${RPCSRC:.x=.c} h_testbits_xdr.c CFLAGS+= -I${.OBJDIR} DPSRCS+= h_testbits.h LDADD+= -lrpcsvc -lutil DPADD+= ${LIBRPCSVC} ${LIBUTIL} .include "../Makefile.netbsd-tests" .include Index: head/lib/libc/tests/setjmp/Makefile =================================================================== --- head/lib/libc/tests/setjmp/Makefile (revision 289171) +++ head/lib/libc/tests/setjmp/Makefile (revision 289172) @@ -1,13 +1,13 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/lib/libc/setjmp - NETBSD_ATF_TESTS_C= t_setjmp NETBSD_ATF_TESTS_C+= t_threadjmp DPADD.t_threadjmp+= ${LIBPTHREAD} LDADD.t_threadjmp+= -lpthread WARNS?= 4 + +.include "../Makefile.netbsd-tests" .include Index: head/lib/libc/tests/ssp/Makefile =================================================================== --- head/lib/libc/tests/ssp/Makefile (revision 289171) +++ head/lib/libc/tests/ssp/Makefile (revision 289172) @@ -1,49 +1,47 @@ # $FreeBSD$ .include -TESTSDIR= ${TESTSBASE}/lib/libc/ssp - NO_WERROR= WARNS?= 2 CFLAGS.h_raw+= -fstack-protector-all -Wstack-protector .if ${COMPILER_TYPE} == "clang" CFLAGS.h_raw+= -fsanitize=bounds .elif ${COMPILER_TYPE} == "gcc" CFLAGS.h_raw+= --param ssp-buffer-size=1 DPADD+= ${LIBSSP} LDADD+= -lssp .endif NETBSD_ATF_TESTS_SH= ssp_test BINDIR= ${TESTSDIR} PROGS= h_fgets PROGS+= h_gets PROGS+= h_getcwd PROGS+= h_memcpy PROGS+= h_memmove PROGS+= h_memset # This testcase doesn't run properly when not compiled with -fsantize=bounds # with clang, which is currently contingent on a compiler_rt update .if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} < 30500 PROGS+= h_raw .endif PROGS+= h_read PROGS+= h_readlink PROGS+= h_snprintf PROGS+= h_sprintf PROGS+= h_stpcpy PROGS+= h_stpncpy PROGS+= h_strcat PROGS+= h_strcpy PROGS+= h_strncat PROGS+= h_strncpy PROGS+= h_vsnprintf PROGS+= h_vsprintf .include "../Makefile.netbsd-tests" .include Index: head/lib/libc/tests/stdio/Makefile =================================================================== --- head/lib/libc/tests/stdio/Makefile (revision 289171) +++ head/lib/libc/tests/stdio/Makefile (revision 289172) @@ -1,19 +1,17 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/lib/libc/stdio - ATF_TESTS_C= fmemopen2_test NETBSD_ATF_TESTS_C= clearerr_test NETBSD_ATF_TESTS_C+= fflush_test NETBSD_ATF_TESTS_C+= fmemopen_test NETBSD_ATF_TESTS_C+= fopen_test NETBSD_ATF_TESTS_C+= fputc_test NETBSD_ATF_TESTS_C+= mktemp_test NETBSD_ATF_TESTS_C+= popen_test NETBSD_ATF_TESTS_C+= printf_test NETBSD_ATF_TESTS_C+= scanf_test .include "../Makefile.netbsd-tests" .include Index: head/lib/libc/tests/stdlib/Makefile =================================================================== --- head/lib/libc/tests/stdlib/Makefile (revision 289171) +++ head/lib/libc/tests/stdlib/Makefile (revision 289172) @@ -1,44 +1,42 @@ # $FreeBSD$ .include -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 NETBSD_ATF_TESTS_C+= div_test NETBSD_ATF_TESTS_C+= getenv_test NETBSD_ATF_TESTS_C+= exit_test NETBSD_ATF_TESTS_C+= hsearch_test NETBSD_ATF_TESTS_C+= posix_memalign_test NETBSD_ATF_TESTS_C+= random_test NETBSD_ATF_TESTS_C+= strtod_test NETBSD_ATF_TESTS_C+= strtol_test NETBSD_ATF_TESTS_C+= system_test # TODO: need to come up with a correct explanation of what the patch pho does # with h_atexit #ATF_TESTS_SH= atexit_test NETBSD_ATF_TESTS_SH= getopt_test .include "../Makefile.netbsd-tests" BINDIR= ${TESTSDIR} # TODO: see comment above #PROGS+= h_atexit PROGS+= h_getopt h_getopt_long .for t in h_getopt h_getopt_long CFLAGS.$t+= -I${LIBNETBSD_SRCDIR} -I${SRCTOP}/contrib/netbsd-tests LDFLAGS.$t+= -L${LIBNETBSD_OBJDIR} DPADD.$t+= ${LIBNETBSD} ${LIBUTIL} LDADD.$t+= -lnetbsd -lutil .endfor DPADD.strtod_test+= ${LIBM} LDADD.strtod_test+= -lm .include Index: head/lib/libc/tests/string/Makefile =================================================================== --- head/lib/libc/tests/string/Makefile (revision 289171) +++ head/lib/libc/tests/string/Makefile (revision 289172) @@ -1,33 +1,31 @@ # $FreeBSD$ .include -TESTSDIR= ${TESTSBASE}/lib/libc/string - # TODO: popcount, stresep NETBSD_ATF_TESTS_C+= memchr NETBSD_ATF_TESTS_C+= memcpy NETBSD_ATF_TESTS_C+= memmem NETBSD_ATF_TESTS_C+= memset NETBSD_ATF_TESTS_C+= strcat NETBSD_ATF_TESTS_C+= strchr NETBSD_ATF_TESTS_C+= strcmp NETBSD_ATF_TESTS_C+= strcpy NETBSD_ATF_TESTS_C+= strcspn NETBSD_ATF_TESTS_C+= strerror NETBSD_ATF_TESTS_C+= strlen NETBSD_ATF_TESTS_C+= strpbrk NETBSD_ATF_TESTS_C+= strrchr NETBSD_ATF_TESTS_C+= strspn NETBSD_ATF_TESTS_C+= swab .include "../Makefile.netbsd-tests" LDADD.memchr+= -lmd DPADD.memchr+= ${LIBMD} LDADD.memcpy+= -lmd DPADD.memcpy+= ${LIBMD} .include Index: head/lib/libc/tests/sys/Makefile =================================================================== --- head/lib/libc/tests/sys/Makefile (revision 289171) +++ head/lib/libc/tests/sys/Makefile (revision 289172) @@ -1,85 +1,83 @@ # $FreeBSD$ .include -TESTSDIR= ${TESTSBASE}/lib/libc/sys - # TODO: clone, lwp_create, lwp_ctl, posix_fadvise, recvmmsg, # swapcontext NETBSD_ATF_TESTS_C+= access_test NETBSD_ATF_TESTS_C+= chroot_test NETBSD_ATF_TESTS_C+= clock_gettime_test NETBSD_ATF_TESTS_C+= connect_test NETBSD_ATF_TESTS_C+= dup_test NETBSD_ATF_TESTS_C+= fsync_test NETBSD_ATF_TESTS_C+= getcontext_test NETBSD_ATF_TESTS_C+= getgroups_test NETBSD_ATF_TESTS_C+= getitimer_test NETBSD_ATF_TESTS_C+= getlogin_test NETBSD_ATF_TESTS_C+= getpid_test NETBSD_ATF_TESTS_C+= getrusage_test NETBSD_ATF_TESTS_C+= getsid_test NETBSD_ATF_TESTS_C+= gettimeofday_test NETBSD_ATF_TESTS_C+= issetugid_test NETBSD_ATF_TESTS_C+= kevent_test NETBSD_ATF_TESTS_C+= kill_test NETBSD_ATF_TESTS_C+= link_test NETBSD_ATF_TESTS_C+= listen_test NETBSD_ATF_TESTS_C+= mincore_test NETBSD_ATF_TESTS_C+= mkdir_test NETBSD_ATF_TESTS_C+= mkfifo_test NETBSD_ATF_TESTS_C+= mknod_test NETBSD_ATF_TESTS_C+= mlock_test NETBSD_ATF_TESTS_C+= mmap_test NETBSD_ATF_TESTS_C+= mprotect_test NETBSD_ATF_TESTS_C+= msgctl_test NETBSD_ATF_TESTS_C+= msgget_test NETBSD_ATF_TESTS_C+= msgrcv_test NETBSD_ATF_TESTS_C+= msgsnd_test NETBSD_ATF_TESTS_C+= msync_test NETBSD_ATF_TESTS_C+= nanosleep_test NETBSD_ATF_TESTS_C+= pipe_test NETBSD_ATF_TESTS_C+= pipe2_test NETBSD_ATF_TESTS_C+= poll_test NETBSD_ATF_TESTS_C+= revoke_test NETBSD_ATF_TESTS_C+= select_test NETBSD_ATF_TESTS_C+= setrlimit_test NETBSD_ATF_TESTS_C+= setuid_test NETBSD_ATF_TESTS_C+= sigaction_test NETBSD_ATF_TESTS_C+= sigqueue_test NETBSD_ATF_TESTS_C+= sigtimedwait_test NETBSD_ATF_TESTS_C+= socketpair_test NETBSD_ATF_TESTS_C+= stat_test NETBSD_ATF_TESTS_C+= timer_create_test NETBSD_ATF_TESTS_C+= truncate_test NETBSD_ATF_TESTS_C+= ucontext_test NETBSD_ATF_TESTS_C+= umask_test NETBSD_ATF_TESTS_C+= unlink_test NETBSD_ATF_TESTS_C+= write_test DPADD.getpid_test+= ${LIBPTHREAD} LDADD.getpid_test+= -lpthread DPADD.timer_create_test+= ${LIBRT} LDADD.timer_create_test+= -lrt .include "../Makefile.netbsd-tests" .if ${COMPILER_TYPE} == "gcc" WARNS?= 3 .else WARNS?= 4 .endif FILESGROUPS= FILES truncate_test_FILES truncate_test_FILES= truncate_test.root_owned truncate_test_FILESDIR= ${TESTSDIR} truncate_test_FILESMODE= 0600 truncate_test_FILESOWNER= root truncate_test_FILESGRP= wheel CLEANFILES= truncate_test.root_owned truncate_test.root_owned: dd if=/dev/null bs=1 count=1 of=${.TARGET} .include Index: head/lib/libc/tests/termios/Makefile =================================================================== --- head/lib/libc/tests/termios/Makefile (revision 289171) +++ head/lib/libc/tests/termios/Makefile (revision 289172) @@ -1,11 +1,9 @@ # $FreeBSD$ .include -TESTSDIR= ${TESTSBASE}/lib/libc/termios - NETBSD_ATF_TESTS_C= tcsetpgrp_test .include "../Makefile.netbsd-tests" .include Index: head/lib/libc/tests/time/Makefile =================================================================== --- head/lib/libc/tests/time/Makefile (revision 289171) +++ head/lib/libc/tests/time/Makefile (revision 289172) @@ -1,12 +1,10 @@ # $FreeBSD$ .include -TESTSDIR= ${TESTSBASE}/lib/libc/time - NETBSD_ATF_TESTS_C= mktime_test NETBSD_ATF_TESTS_C+= strptime_test .include "../Makefile.netbsd-tests" .include Index: head/lib/libc/tests/tls/Makefile =================================================================== --- head/lib/libc/tests/tls/Makefile (revision 289171) +++ head/lib/libc/tests/tls/Makefile (revision 289172) @@ -1,35 +1,34 @@ # $FreeBSD$ .include -TESTSDIR= ${TESTSBASE}/lib/libc/tls .if !defined(NO_PIC) SUBDIR+= dso .endif # TODO: doesn't link properly (for some odd reason it's trying to link in # libatf.so) #NETBSD_ATF_TESTS_C= tls_static_test .if !defined(NO_PIC) NETBSD_ATF_TESTS_C+= tls_dlopen_test NETBSD_ATF_TESTS_C+= tls_dynamic_test .endif .include "../Makefile.netbsd-tests" DSODIR= ${.OBJDIR}/../tls_dso DPADD.tls_static_test+= ${LIBPTHREAD} LDADD.tls_static_test+= -lpthread LDFLAGS.tls_static_test+= -static SRCS.tls_static_test= t_tls_static.c t_tls_static_helper.c DPADD.tls_dynamic_test+= ${LIBPTHREAD} ${DSODIR}/libh_tls_dynamic.so LDADD.tls_dynamic_test+= -lpthread -lh_tls_dynamic LDFLAGS.tls_dynamic_test+= -Wl,-rpath,${TESTSDIR} -L${DSODIR} DPADD.tls_dlopen_test+= ${LIBPTHREAD} LDADD.tls_dlopen_test+= -lpthread LDFLAGS.tls_dlopen_test+= -Wl,-rpath,${TESTSDIR} -Wl,-export-dynamic .include Index: head/lib/libc/tests/tls/dso/Makefile =================================================================== --- head/lib/libc/tests/tls/dso/Makefile (revision 289171) +++ head/lib/libc/tests/tls/dso/Makefile (revision 289172) @@ -1,18 +1,17 @@ # $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 SHLIB_NAME= h_tls_dlopen.so SRCS= h_tls_dlopen.c MAN= LIBDIR= ${TESTSBASE}/lib/libc/tls SHLIB_MAJOR= 1 .include "../../Makefile.netbsd-tests" .include Index: head/lib/libc/tests/tls_dso/Makefile =================================================================== --- head/lib/libc/tests/tls_dso/Makefile (revision 289171) +++ head/lib/libc/tests/tls_dso/Makefile (revision 289172) @@ -1,20 +1,22 @@ # $FreeBSD$ +SRCDIR= ${SRCTOP}/contrib/netbsd/ + .include LIB= h_tls_dynamic SRCS= h_tls_dynamic.c LIBDIR= ${TESTSBASE}/lib/libc/tls SHLIBDIR= ${TESTSBASE}/lib/libc/tls SHLIB_MAJOR= 1 WITHOUT_STATIC= WITHOUT_PROFILE= WITHOUT_PIC= MAN= .include "../Makefile.netbsd-tests" .include Index: head/lib/libc/tests/ttyio/Makefile =================================================================== --- head/lib/libc/tests/ttyio/Makefile (revision 289171) +++ head/lib/libc/tests/ttyio/Makefile (revision 289172) @@ -1,15 +1,13 @@ # $FreeBSD$ .include -TESTSDIR= ${TESTSBASE}/lib/libc/ttyio - # TODO: ptm_test NETBSD_ATF_TESTS_C= ttyio_test DPADD.ttyio_test+= ${LIBUTIL} LDADD.ttyio_test+= -lutil .include "../Makefile.netbsd-tests" .include Index: head/lib/libcrypt/tests/Makefile =================================================================== --- head/lib/libcrypt/tests/Makefile (revision 289171) +++ head/lib/libcrypt/tests/Makefile (revision 289172) @@ -1,12 +1,10 @@ # $FreeBSD$ # exercise libcrypt -TESTSDIR= ${TESTSBASE}/lib/libcrypt - ATF_TESTS_C= crypt_tests CFLAGS+= -I${.CURDIR:H} LIBADD= crypt .include Index: head/lib/libmp/tests/Makefile =================================================================== --- head/lib/libmp/tests/Makefile (revision 289171) +++ head/lib/libmp/tests/Makefile (revision 289172) @@ -1,9 +1,7 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/lib/libmp - TAP_TESTS_C+= legacy_test LIBADD+= mp .include Index: head/lib/libnv/tests/Makefile =================================================================== --- head/lib/libnv/tests/Makefile (revision 289171) +++ head/lib/libnv/tests/Makefile (revision 289172) @@ -1,21 +1,19 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/lib/libnv - ATF_TESTS_CXX= \ dnv_tests \ nv_array_tests \ nv_tests \ TAP_TESTS_C+= nvlist_add_test TAP_TESTS_C+= nvlist_exists_test TAP_TESTS_C+= nvlist_free_test TAP_TESTS_C+= nvlist_get_test TAP_TESTS_C+= nvlist_move_test TAP_TESTS_C+= nvlist_send_recv_test LIBADD+= nv WARNS?= 3 .include Index: head/lib/libpam/libpam/tests/Makefile =================================================================== --- head/lib/libpam/libpam/tests/Makefile (revision 289171) +++ head/lib/libpam/libpam/tests/Makefile (revision 289172) @@ -1,18 +1,18 @@ # $FreeBSD$ -OPENPAM = ${.CURDIR}/../../../../contrib/openpam +OPENPAM= ${SRCTOP}/contrib/openpam .PATH: ${OPENPAM}/t TESTSDIR = ${TESTSBASE}/lib/libpam COMMONSRC = t_file.c t_main.c .for test in t_openpam_ctype t_openpam_readlinev t_openpam_readword TAP_TESTS_C += ${test} SRCS.${test} = ${test}.c ${COMMONSRC} .endfor CFLAGS +=-I${OPENPAM}/include -I${OPENPAM}/lib/libpam -I${OPENPAM}/t WARNS ?= 6 LIBADD = pam .include Index: head/lib/libproc/tests/Makefile =================================================================== --- head/lib/libproc/tests/Makefile (revision 289171) +++ head/lib/libproc/tests/Makefile (revision 289172) @@ -1,21 +1,18 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/lib/libproc - ATF_TESTS_C+= proc_test PROGS= target_prog SRCS_target_prog= target_prog.c BINDIR_target_prog= ${TESTSDIR} LDADD+= -lelf -lproc -lrtld_db -lutil DPADD+= ${LIBELF} ${LIBPROC} ${LIBRTLD_DB} ${LIBUTIL} # Ensure that symbols aren't stripped from the test program, as they're needed # for testing symbol lookup. STRIP= -MAN= WARNS?= 6 .include Index: head/lib/librt/tests/Makefile =================================================================== --- head/lib/librt/tests/Makefile (revision 289171) +++ head/lib/librt/tests/Makefile (revision 289172) @@ -1,16 +1,10 @@ # $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 NETBSD_ATF_TESTS_C+= sem_test .include .include Index: head/lib/libthr/tests/Makefile =================================================================== --- head/lib/libthr/tests/Makefile (revision 289171) +++ head/lib/libthr/tests/Makefile (revision 289172) @@ -1,60 +1,56 @@ # $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 NETBSD_ATF_TESTS_C+= condwait_test NETBSD_ATF_TESTS_C+= detach_test NETBSD_ATF_TESTS_C+= equal_test NETBSD_ATF_TESTS_C+= fork_test NETBSD_ATF_TESTS_C+= fpu_test NETBSD_ATF_TESTS_C+= join_test NETBSD_ATF_TESTS_C+= kill_test NETBSD_ATF_TESTS_C+= mutex_test NETBSD_ATF_TESTS_C+= once_test NETBSD_ATF_TESTS_C+= preempt_test NETBSD_ATF_TESTS_C+= rwlock_test NETBSD_ATF_TESTS_C+= sem_test NETBSD_ATF_TESTS_C+= sigmask_test NETBSD_ATF_TESTS_C+= sigsuspend_test NETBSD_ATF_TESTS_C+= siglongjmp_test NETBSD_ATF_TESTS_C+= sleep_test .if ${MACHINE} != "arm64" # ARM64TODO: Missing makecontext NETBSD_ATF_TESTS_C+= swapcontext_test .endif NETBSD_ATF_TESTS_SH= atexit_test NETBSD_ATF_TESTS_SH+= cancel_test NETBSD_ATF_TESTS_SH+= exit_test NETBSD_ATF_TESTS_SH+= resolv_test DPADD+= ${LIBPTHREAD} LDADD+= -lpthread DPADD.fpu_test+= ${LIBM} LDADD.fpu_test+= -lm DPADD.sem_test+= ${LIBRT} LDADD.sem_test+= -lrt BINDIR= ${TESTSDIR} PROGS= h_atexit PROGS+= h_cancel PROGS+= h_exit PROGS+= h_resolv FILESDIR= ${TESTSDIR} FILES= d_mach TESTS_SUBDIRS= dlopen .include CFLAGS.condwait_test+= -I${SRCTOP}/contrib/netbsd-tests/lib/libc/gen .include Index: head/lib/libthr/tests/dlopen/Makefile =================================================================== --- head/lib/libthr/tests/dlopen/Makefile (revision 289171) +++ head/lib/libthr/tests/dlopen/Makefile (revision 289172) @@ -1,30 +1,28 @@ # $FreeBSD$ -OBJTOP= ${.OBJDIR:H:H:H:H} -SRCTOP= ${.CURDIR:H:H:H:H} TESTSRC= ${SRCTOP}/contrib/netbsd-tests/lib/libpthread/dlopen .include TESTSDIR= ${TESTSBASE}/lib/libthr/dlopen CFLAGS+= -DTESTDIR=\"${TESTSDIR:Q}/\" LDFLAGS+= -L${.OBJDIR}/dso -Wl,-rpath=${TESTDIR} .if !defined(NO_PIC) SUBDIR+= dso NETBSD_ATF_TESTS_C= dlopen_test NETBSD_ATF_TESTS_C+= main_pthread_create_test # XXX: this blocks running the testcase #NETBSD_ATF_TESTS_C+= dso_pthread_create_test .for t in dlopen_test main_pthread_create_test DPADD.$t+= ${LIBPTHREAD} LDADD.$t+= -lpthread .endfor .endif .include .include Index: head/lib/libthr/tests/dlopen/dso/Makefile =================================================================== --- head/lib/libthr/tests/dlopen/dso/Makefile (revision 289171) +++ head/lib/libthr/tests/dlopen/dso/Makefile (revision 289172) @@ -1,19 +1,18 @@ # $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 SHLIB_MAJOR= 1 SHLIB_NAME= h_pthread_dlopen.so.${SHLIB_MAJOR} SRCS= h_pthread_dlopen.c DPADD+= ${LIBPTHREAD} LDADD+= -lpthread LIBDIR= ${TESTSBASE}/lib/libthr/dlopen .include .include Index: head/lib/libutil/tests/Makefile =================================================================== --- head/lib/libutil/tests/Makefile (revision 289171) +++ head/lib/libutil/tests/Makefile (revision 289172) @@ -1,16 +1,14 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/lib/libutil - TAP_TESTS_C+= flopen_test TAP_TESTS_C+= grp_test TAP_TESTS_C+= humanize_number_test .if ${MACHINE_CPUARCH} != "aarch64" # PR202304: pidfile_test hangs on arm64 TAP_TESTS_C+= pidfile_test .endif TAP_TESTS_C+= trimdomain_test TAP_TESTS_C+= trimdomain-nodomain_test LIBADD+= util .include Index: head/lib/msun/tests/Makefile =================================================================== --- head/lib/msun/tests/Makefile (revision 289171) +++ head/lib/msun/tests/Makefile (revision 289172) @@ -1,61 +1,57 @@ # $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 # Not sure why this isn't defined for all architectures, since most # have long double. .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" CFLAGS+= -D__HAVE_LONG_DOUBLE .endif NETBSD_ATF_TESTS_C= acos_test NETBSD_ATF_TESTS_C+= asin_test NETBSD_ATF_TESTS_C+= atan_test NETBSD_ATF_TESTS_C+= cbrt_test NETBSD_ATF_TESTS_C+= ceil_test NETBSD_ATF_TESTS_C+= cos_test NETBSD_ATF_TESTS_C+= cosh_test NETBSD_ATF_TESTS_C+= erf_test NETBSD_ATF_TESTS_C+= exp_test NETBSD_ATF_TESTS_C+= fmod_test NETBSD_ATF_TESTS_C+= infinity_test NETBSD_ATF_TESTS_C+= ldexp_test NETBSD_ATF_TESTS_C+= log_test NETBSD_ATF_TESTS_C+= pow_test NETBSD_ATF_TESTS_C+= precision_test NETBSD_ATF_TESTS_C+= round_test NETBSD_ATF_TESTS_C+= scalbn_test NETBSD_ATF_TESTS_C+= sin_test NETBSD_ATF_TESTS_C+= sinh_test NETBSD_ATF_TESTS_C+= sqrt_test NETBSD_ATF_TESTS_C+= tan_test NETBSD_ATF_TESTS_C+= tanh_test CSTD= c99 LIBADD+= m #COPTS+= -Wfloat-equal # Copied from lib/msun/Makefile .if ${MACHINE_CPUARCH} == "i386" ARCH_SUBDIR= i387 .else ARCH_SUBDIR= ${MACHINE_CPUARCH} .endif .include "../${ARCH_SUBDIR}/Makefile.inc" # XXX: for some odd reason float.h doesn't tell the full story about what the # precision is. CFLAGS+= -DLDBL_PREC=${LDBL_PREC} .include .include Index: head/lib/tests/Makefile =================================================================== --- head/lib/tests/Makefile (revision 289171) +++ head/lib/tests/Makefile (revision 289172) @@ -1,10 +1,8 @@ # $FreeBSD$ .include -TESTSDIR= ${TESTSBASE}/lib - -.PATH: ${.CURDIR:H:H}/tests +.PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/libexec/atf/atf-check/tests/Makefile =================================================================== --- head/libexec/atf/atf-check/tests/Makefile (revision 289171) +++ head/libexec/atf/atf-check/tests/Makefile (revision 289172) @@ -1,12 +1,10 @@ # $FreeBSD$ .include -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 .include Index: head/libexec/atf/atf-sh/tests/Makefile =================================================================== --- head/libexec/atf/atf-sh/tests/Makefile (revision 289171) +++ head/libexec/atf/atf-sh/tests/Makefile (revision 289172) @@ -1,30 +1,28 @@ # $FreeBSD$ .include -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 ATF_TESTS_SH+= config_test ATF_TESTS_SH+= integration_test ATF_TESTS_SH+= normalize_test ATF_TESTS_SH+= tc_test ATF_TESTS_SH+= tp_test integration_test: Makefile ATF_TESTS_SH_SED_integration_test= \ -e 's,__ATF_SH__,/usr/libexec/atf-sh,g' SCRIPTS+= misc_helpers SCRIPTSDIR_misc_helpers=${TESTSDIR} CLEANFILES+= misc_helpers misc_helpers.tmp misc_helpers: misc_helpers.sh echo '#! /usr/libexec/atf-sh' >${.TARGET}.tmp cat ${.ALLSRC} >>${.TARGET}.tmp chmod +x ${.TARGET}.tmp mv ${.TARGET}.tmp ${.TARGET} .include Index: head/libexec/atf/tests/Makefile =================================================================== --- head/libexec/atf/tests/Makefile (revision 289171) +++ head/libexec/atf/tests/Makefile (revision 289172) @@ -1,10 +1,8 @@ # $FreeBSD$ .include -TESTSDIR= ${TESTSBASE}/libexec/atf - -.PATH: ${.CURDIR:H:H:H}/tests +.PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/libexec/rtld-elf/tests/Makefile =================================================================== --- head/libexec/rtld-elf/tests/Makefile (revision 289171) +++ head/libexec/rtld-elf/tests/Makefile (revision 289172) @@ -1,10 +1,9 @@ # $FreeBSD$ .include -TESTSDIR= ${TESTSBASE}/libexec/rtld-elf SUBDIR+= libpythagoras target ATF_TESTS_C= ld_library_pathfds .include Index: head/libexec/tests/Makefile =================================================================== --- head/libexec/tests/Makefile (revision 289171) +++ head/libexec/tests/Makefile (revision 289172) @@ -1,10 +1,8 @@ # $FreeBSD$ .include -TESTSDIR= ${TESTSBASE}/libexec - -.PATH: ${.CURDIR:H:H}/tests +.PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/sbin/devd/tests/Makefile =================================================================== --- head/sbin/devd/tests/Makefile (revision 289171) +++ head/sbin/devd/tests/Makefile (revision 289172) @@ -1,12 +1,10 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/sbin/devd - ATF_TESTS_C= client_test TEST_METADATA.client_test= required_programs="devd" TEST_METADATA.client_test+= required_user="root" TEST_METADATA.client_test+= timeout=15 WARNS?= 5 .include Index: head/sbin/dhclient/tests/Makefile =================================================================== --- head/sbin/dhclient/tests/Makefile (revision 289171) +++ head/sbin/dhclient/tests/Makefile (revision 289172) @@ -1,16 +1,14 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/sbin/dhclient - .PATH: ${.CURDIR}/.. PLAIN_TESTS_C= option-domain-search_test SRCS.option-domain-search_test= alloc.c convert.c hash.c options.c \ tables.c fake.c option-domain-search.c CFLAGS.option-domain-search_test+= -I${.CURDIR}/.. DPADD.option-domain-search_test= ${LIBUTIL} LDADD.option-domain-search_test= -lutil WARNS?= 2 .include Index: head/sbin/growfs/tests/Makefile =================================================================== --- head/sbin/growfs/tests/Makefile (revision 289171) +++ head/sbin/growfs/tests/Makefile (revision 289172) @@ -1,7 +1,5 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/sbin/growfs - TAP_TESTS_PERL= legacy_test .include Index: head/sbin/ifconfig/tests/Makefile =================================================================== --- head/sbin/ifconfig/tests/Makefile (revision 289171) +++ head/sbin/ifconfig/tests/Makefile (revision 289172) @@ -1,13 +1,7 @@ # $FreeBSD$ -OBJTOP= ${.OBJDIR}/../../.. -SRCTOP= ${.CURDIR}/../../.. -TESTSRC= ${SRCTOP}/contrib/netbsd-tests/sbin/ifconfig - -TESTSDIR= ${TESTSBASE}/sbin/ifconfig - NETBSD_ATF_TESTS_SH= nonexistent_test .include .include Index: head/sbin/mdconfig/tests/Makefile =================================================================== --- head/sbin/mdconfig/tests/Makefile (revision 289171) +++ head/sbin/mdconfig/tests/Makefile (revision 289172) @@ -1,10 +1,7 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/sbin/mdconfig - ATF_TESTS_SH= mdconfig_test - TEST_METADATA.mdconfig_test+= required_user="root" .include Index: head/sbin/tests/Makefile =================================================================== --- head/sbin/tests/Makefile (revision 289171) +++ head/sbin/tests/Makefile (revision 289172) @@ -1,10 +1,8 @@ # $FreeBSD$ .include -TESTSDIR= ${TESTSBASE}/sbin - -.PATH: ${.CURDIR:H:H}/tests +.PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/secure/lib/tests/Makefile =================================================================== --- head/secure/lib/tests/Makefile (revision 289171) +++ head/secure/lib/tests/Makefile (revision 289172) @@ -1,10 +1,8 @@ # $FreeBSD$ .include -TESTSDIR= ${TESTSBASE}/secure/lib - -.PATH: ${.CURDIR:H:H:H}/tests +.PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/secure/libexec/tests/Makefile =================================================================== --- head/secure/libexec/tests/Makefile (revision 289171) +++ head/secure/libexec/tests/Makefile (revision 289172) @@ -1,10 +1,8 @@ # $FreeBSD$ .include -TESTSDIR= ${TESTSBASE}/secure/libexec - -.PATH: ${.CURDIR:H:H:H}/tests +.PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/secure/tests/Makefile =================================================================== --- head/secure/tests/Makefile (revision 289171) +++ head/secure/tests/Makefile (revision 289172) @@ -1,10 +1,8 @@ # $FreeBSD$ .include -TESTSDIR= ${TESTSBASE}/secure - -.PATH: ${.CURDIR:H:H}/tests +.PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/secure/usr.bin/tests/Makefile =================================================================== --- head/secure/usr.bin/tests/Makefile (revision 289171) +++ head/secure/usr.bin/tests/Makefile (revision 289172) @@ -1,10 +1,8 @@ # $FreeBSD$ .include -TESTSDIR= ${TESTSBASE}/secure/usr.bin - -.PATH: ${.CURDIR:H:H:H}/tests +.PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/secure/usr.sbin/tests/Makefile =================================================================== --- head/secure/usr.sbin/tests/Makefile (revision 289171) +++ head/secure/usr.sbin/tests/Makefile (revision 289172) @@ -1,10 +1,8 @@ # $FreeBSD$ .include -TESTSDIR= ${TESTSBASE}/secure/usr.sbin - -.PATH: ${.CURDIR:H:H:H}/tests +.PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/share/examples/tests/Makefile =================================================================== --- head/share/examples/tests/Makefile (revision 289171) +++ head/share/examples/tests/Makefile (revision 289172) @@ -1,12 +1,10 @@ # $FreeBSD$ .include -TESTSDIR= ${TESTSBASE}/share/examples - SUBDIR= tests +.PATH: ${SRCTOP}/tests KYUAFILE= yes -.PATH: ${.CURDIR:H:H:H}/tests .include Index: head/share/tests/Makefile =================================================================== --- head/share/tests/Makefile (revision 289171) +++ head/share/tests/Makefile (revision 289172) @@ -1,10 +1,10 @@ # $FreeBSD$ .include TESTSDIR= ${TESTSBASE}/share -.PATH: ${.CURDIR:H:H}/tests +.PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head/tests/etc/Makefile =================================================================== --- head/tests/etc/Makefile (revision 289171) +++ head/tests/etc/Makefile (revision 289172) @@ -1,12 +1,12 @@ # $FreeBSD$ .include TESTSDIR= ${TESTSBASE}/etc -.PATH: ${.CURDIR:H} +.PATH: ${SRCTOP}/tests KYUAFILE= yes SUBDIR+= rc.d .include Index: head/tests/sys/mqueue/Makefile =================================================================== --- head/tests/sys/mqueue/Makefile (revision 289171) +++ head/tests/sys/mqueue/Makefile (revision 289172) @@ -1,22 +1,22 @@ # $FreeBSD$ TESTSDIR= ${TESTSBASE}/sys/mqueue ATF_TESTS_SH= mqueue_test BINDIR= ${TESTSDIR} -CFLAGS+= -I${.CURDIR:H:H} +CFLAGS+= -I${SRCTOP}/tests PROGS+= mqtest1 PROGS+= mqtest2 PROGS+= mqtest3 PROGS+= mqtest4 PROGS+= mqtest5 LDADD+= -lrt DPADD+= ${LIBRT} WARNS?= 6 .include Index: head/tests/sys/pjdfstest/tests/Makefile =================================================================== --- head/tests/sys/pjdfstest/tests/Makefile (revision 289171) +++ head/tests/sys/pjdfstest/tests/Makefile (revision 289172) @@ -1,39 +1,39 @@ # $FreeBSD$ -PJDFSTEST_SRCDIR= ${.CURDIR:H:H:H:H}/contrib/pjdfstest +PJDFSTEST_SRCDIR= ${SRCTOP}/contrib/pjdfstest TESTSDIR= ${TESTSBASE}/sys/pjdfstest .PATH: ${.CURDIR} FILESDIR= ${TESTSDIR} FILES= conf FILES+= misc.sh CLEANFILES+= misc.sh misc.sh.tmp misc.sh: ${PJDFSTEST_SRCDIR}/tests/misc.sh sed -e '\,maindir=,s,maindir=.*,maindir=`dirname $$0`/../,' < ${.ALLSRC} > ${.TARGET}.tmp mv ${.TARGET}.tmp ${.TARGET} afterinstall: install-tests-symlink install-tests-symlink: .PHONY rm -f ${DESTDIR}${TESTSDIR}/tests ${INSTALL_SYMLINK} . ${DESTDIR}${TESTSDIR}/tests TESTS_SUBDIRS= chflags TESTS_SUBDIRS+= chmod TESTS_SUBDIRS+= chown TESTS_SUBDIRS+= ftruncate TESTS_SUBDIRS+= granular TESTS_SUBDIRS+= link TESTS_SUBDIRS+= mkdir TESTS_SUBDIRS+= mkfifo TESTS_SUBDIRS+= mknod TESTS_SUBDIRS+= open TESTS_SUBDIRS+= rename TESTS_SUBDIRS+= rmdir TESTS_SUBDIRS+= symlink TESTS_SUBDIRS+= truncate TESTS_SUBDIRS+= unlink .include Index: head/usr.bin/apply/tests/Makefile =================================================================== --- head/usr.bin/apply/tests/Makefile (revision 289171) +++ head/usr.bin/apply/tests/Makefile (revision 289172) @@ -1,14 +1,12 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/apply - TAP_TESTS_SH= legacy_test FILESDIR= ${TESTSDIR} FILES= regress.00.in FILES+= regress.00.out FILES+= regress.01.out FILES+= regress.01.sh FILES+= regress.sh .include Index: head/usr.bin/basename/tests/Makefile =================================================================== --- head/usr.bin/basename/tests/Makefile (revision 289171) +++ head/usr.bin/basename/tests/Makefile (revision 289172) @@ -1,12 +1,7 @@ # $FreeBSD$ -TESTSRC= ${.CURDIR}/../../../contrib/netbsd-tests/usr.bin/basename -.PATH: ${TESTSRC} +NETBSD_ATF_TESTS_SH= basename_test -.include - -TESTSDIR= ${TESTSBASE}/usr.bin/basename -ATF_TESTS_SH= basename_test -ATF_TESTS_SH_SRC_basename_test= t_basename.sh +.include .include Index: head/usr.bin/calendar/tests/Makefile =================================================================== --- head/usr.bin/calendar/tests/Makefile (revision 289171) +++ head/usr.bin/calendar/tests/Makefile (revision 289172) @@ -1,39 +1,37 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/calendar - TAP_TESTS_SH= legacy_test FILESDIR= ${TESTSDIR} FILES= calendar.calibrate FILES+= regress.a1.out FILES+= regress.a2.out FILES+= regress.a3.out FILES+= regress.a4.out FILES+= regress.a5.out FILES+= regress.b1.out FILES+= regress.b2.out FILES+= regress.b3.out FILES+= regress.b4.out FILES+= regress.b5.out FILES+= regress.s1.out FILES+= regress.s2.out FILES+= regress.s3.out FILES+= regress.s4.out FILES+= regress.sh FILES+= regress.w0-1.out FILES+= regress.w0-2.out FILES+= regress.w0-3.out FILES+= regress.w0-4.out FILES+= regress.w0-5.out FILES+= regress.w0-6.out FILES+= regress.w0-7.out FILES+= regress.wn-1.out FILES+= regress.wn-2.out FILES+= regress.wn-3.out FILES+= regress.wn-4.out FILES+= regress.wn-5.out FILES+= regress.wn-6.out FILES+= regress.wn-7.out .include Index: head/usr.bin/cmp/tests/Makefile =================================================================== --- head/usr.bin/cmp/tests/Makefile (revision 289171) +++ head/usr.bin/cmp/tests/Makefile (revision 289172) @@ -1,12 +1,9 @@ # $FreeBSD$ -TESTSRC= ${.CURDIR}/../../../contrib/netbsd-tests/usr.bin/cmp -.PATH: ${TESTSRC} - .include -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 .include Index: head/usr.bin/col/tests/Makefile =================================================================== --- head/usr.bin/col/tests/Makefile (revision 289171) +++ head/usr.bin/col/tests/Makefile (revision 289172) @@ -1,11 +1,9 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/col - ATF_TESTS_SH= col FILES= rlf.in \ rlf2.in FILESDIR= ${TESTSDIR} .include Index: head/usr.bin/comm/tests/Makefile =================================================================== --- head/usr.bin/comm/tests/Makefile (revision 289171) +++ head/usr.bin/comm/tests/Makefile (revision 289172) @@ -1,19 +1,17 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/comm - TAP_TESTS_SH= legacy_test FILESDIR= ${TESTSDIR} FILES= regress.00.out FILES+= regress.00a.in FILES+= regress.00b.in FILES+= regress.01.out FILES+= regress.01a.in FILES+= regress.01b.in FILES+= regress.02.out FILES+= regress.02a.in FILES+= regress.02b.in FILES+= regress.sh .include Index: head/usr.bin/cut/tests/Makefile =================================================================== --- head/usr.bin/cut/tests/Makefile (revision 289171) +++ head/usr.bin/cut/tests/Makefile (revision 289172) @@ -1,21 +1,18 @@ # $FreeBSD$ -TESTSRC= ${.CURDIR}/../../../contrib/netbsd-tests/usr.bin/cut -.PATH: ${TESTSRC} - .include -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 FILES+= d_cut.in FILES+= d_dflag.out FILES+= d_dsflag.out FILES+= d_latin1.in FILES+= d_sflag.out FILES+= d_utf8.in + +.include .include Index: head/usr.bin/dirname/tests/Makefile =================================================================== --- head/usr.bin/dirname/tests/Makefile (revision 289171) +++ head/usr.bin/dirname/tests/Makefile (revision 289172) @@ -1,12 +1,9 @@ # $FreeBSD$ -TESTSRC= ${.CURDIR}/../../../contrib/netbsd-tests/usr.bin/dirname -.PATH: ${TESTSRC} - .include -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 .include Index: head/usr.bin/file2c/tests/Makefile =================================================================== --- head/usr.bin/file2c/tests/Makefile (revision 289171) +++ head/usr.bin/file2c/tests/Makefile (revision 289172) @@ -1,20 +1,18 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/file2c - TAP_TESTS_SH= legacy_test FILESDIR= ${TESTSDIR} FILES= regress.1.out FILES+= regress.2.out FILES+= regress.3.out FILES+= regress.4.out FILES+= regress.5.out FILES+= regress.6.out FILES+= regress.7.out FILES+= regress.8.out FILES+= regress.9.out FILES+= regress.in FILES+= regress.sh .include Index: head/usr.bin/grep/tests/Makefile =================================================================== --- head/usr.bin/grep/tests/Makefile (revision 289171) +++ head/usr.bin/grep/tests/Makefile (revision 289172) @@ -1,41 +1,37 @@ # $FreeBSD$ -TESTSRC= ${.CURDIR}/../../../contrib/netbsd-tests/usr.bin/grep -.PATH: ${TESTSRC} - .include -TESTSDIR= ${TESTSBASE}/usr.bin/grep +NETBSD_ATF_TESTS_SH= grep_test -ATF_TESTS_SH= grep_test -ATF_TESTS_SH_SRC_grep_test= t_grep.sh - FILESDIR= ${TESTSDIR} FILES= d_basic.out FILES+= d_begin_end_a.out FILES+= d_begin_end_b.out FILES+= d_binary.out FILES+= d_context2_a.out FILES+= d_context2_b.out FILES+= d_context2_c.out FILES+= d_context_a.in FILES+= d_context_a.out FILES+= d_context_b.in FILES+= d_context_b.out FILES+= d_context_c.out FILES+= d_context_d.out FILES+= d_egrep.out FILES+= d_file_exp.in FILES+= d_file_exp.out FILES+= d_ignore_case.out FILES+= d_input FILES+= d_invert.in FILES+= d_invert.out FILES+= d_recurse.out FILES+= d_recurse_symlink.err FILES+= d_recurse_symlink.out FILES+= d_whole_line.out FILES+= d_word_regexps.out FILES+= d_zgrep.out + +.include .include Index: head/usr.bin/gzip/tests/Makefile =================================================================== --- head/usr.bin/gzip/tests/Makefile (revision 289171) +++ head/usr.bin/gzip/tests/Makefile (revision 289172) @@ -1,12 +1,9 @@ # $FreeBSD$ -TESTSRC= ${.CURDIR}/../../../contrib/netbsd-tests/usr.bin/gzip -.PATH: ${TESTSRC} - .include -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 .include Index: head/usr.bin/ident/tests/Makefile =================================================================== --- head/usr.bin/ident/tests/Makefile (revision 289171) +++ head/usr.bin/ident/tests/Makefile (revision 289172) @@ -1,11 +1,9 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/ident - ATF_TESTS_SH= ident FILES= test.in \ test.out \ testnoid FILESDIR= ${TESTSDIR} .include Index: head/usr.bin/join/tests/Makefile =================================================================== --- head/usr.bin/join/tests/Makefile (revision 289171) +++ head/usr.bin/join/tests/Makefile (revision 289172) @@ -1,13 +1,11 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/join - TAP_TESTS_SH= legacy_test FILESDIR= ${TESTSDIR} FILES= regress.1.in FILES+= regress.2.in FILES+= regress.out FILES+= regress.sh .include Index: head/usr.bin/jot/tests/Makefile =================================================================== --- head/usr.bin/jot/tests/Makefile (revision 289171) +++ head/usr.bin/jot/tests/Makefile (revision 289172) @@ -1,71 +1,69 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/jot - TAP_TESTS_SH= legacy_test FILESDIR= ${TESTSDIR} FILES= regress.ascii.out FILES+= regress.block.out FILES+= regress.dddd.out FILES+= regress.dddh.out FILES+= regress.ddhd.out FILES+= regress.ddhd2.out FILES+= regress.ddhh.out FILES+= regress.ddhh2.out FILES+= regress.dhdd.out FILES+= regress.dhdh.out FILES+= regress.dhhd.out FILES+= regress.dhhd2.out FILES+= regress.dhhh.out FILES+= regress.dhhh2.out FILES+= regress.ed.out FILES+= regress.grep.out FILES+= regress.hddd.out FILES+= regress.hddd2.out FILES+= regress.hddh.out FILES+= regress.hddh2.out FILES+= regress.hdhd.out FILES+= regress.hdhd2.out FILES+= regress.hdhh.out FILES+= regress.hdhh2.out FILES+= regress.hhdd.out FILES+= regress.hhdd2.out FILES+= regress.hhdh.out FILES+= regress.hhdh2.out FILES+= regress.hhhd.out FILES+= regress.hhhd2.out FILES+= regress.hhhh.out FILES+= regress.hhhh2.out FILES+= regress.n21.out FILES+= regress.rand1.out FILES+= regress.rand2.out FILES+= regress.sh FILES+= regress.stutter.out FILES+= regress.stutter2.out FILES+= regress.tabs.out FILES+= regress.wX1.out FILES+= regress.wXl.out FILES+= regress.wc.out FILES+= regress.wdl.out FILES+= regress.wdn.out FILES+= regress.we.out FILES+= regress.wf.out FILES+= regress.wg.out FILES+= regress.wgd.out FILES+= regress.wo.out FILES+= regress.wp1.out FILES+= regress.wp2.out FILES+= regress.wp3.out FILES+= regress.wp4.out FILES+= regress.wp5.out FILES+= regress.wp6.out FILES+= regress.wu.out FILES+= regress.wwe.out FILES+= regress.wx.out FILES+= regress.wxn.out FILES+= regress.x.out FILES+= regress.xaa.out FILES+= regress.yes.out .include Index: head/usr.bin/lastcomm/tests/Makefile =================================================================== --- head/usr.bin/lastcomm/tests/Makefile (revision 289171) +++ head/usr.bin/lastcomm/tests/Makefile (revision 289172) @@ -1,21 +1,19 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/lastcomm - TAP_TESTS_SH= legacy_test FILESDIR= ${TESTSDIR} FILES= v1-amd64-acct.in FILES+= v1-amd64.out FILES+= v1-i386-acct.in FILES+= v1-i386.out FILES+= v1-sparc64-acct.in FILES+= v1-sparc64.out FILES+= v2-amd64-acct.in FILES+= v2-amd64.out FILES+= v2-i386-acct.in FILES+= v2-i386.out FILES+= v2-sparc64-acct.in FILES+= v2-sparc64.out .include Index: head/usr.bin/m4/tests/Makefile =================================================================== --- head/usr.bin/m4/tests/Makefile (revision 289171) +++ head/usr.bin/m4/tests/Makefile (revision 289172) @@ -1,52 +1,50 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/m4 - TAP_TESTS_SH= legacy_test FILESDIR= ${TESTSDIR} FILES= args.m4 FILES+= args2.m4 FILES+= comments.m4 FILES+= esyscmd.m4 FILES+= eval.m4 FILES+= ff_after_dnl.m4.uu FILES+= gnueval.m4 FILES+= gnuformat.m4 FILES+= gnupatterns.m4 FILES+= gnupatterns2.m4 FILES+= gnuprefix.m4 FILES+= gnusofterror.m4 FILES+= includes.aux FILES+= includes.m4 FILES+= m4wrap3.m4 FILES+= patterns.m4 FILES+= quotes.m4 FILES+= redef.m4 FILES+= regress.args.out FILES+= regress.args2.out FILES+= regress.comments.out FILES+= regress.esyscmd.out FILES+= regress.eval.out FILES+= regress.ff_after_dnl.out FILES+= regress.gnueval.out FILES+= regress.gnuformat.out FILES+= regress.gnupatterns.out FILES+= regress.gnupatterns2.out FILES+= regress.gnuprefix.out FILES+= regress.gnusofterror.out FILES+= regress.gnutranslit2.out FILES+= regress.includes.out FILES+= regress.m4wrap3.out FILES+= regress.patterns.out FILES+= regress.quotes.out FILES+= regress.redef.out FILES+= regress.sh FILES+= regress.strangequotes.out FILES+= regress.translit.out FILES+= regress.translit2.out FILES+= strangequotes.m4.uu FILES+= translit.m4 FILES+= translit2.m4 .include Index: head/usr.bin/mkimg/tests/Makefile =================================================================== --- head/usr.bin/mkimg/tests/Makefile (revision 289171) +++ head/usr.bin/mkimg/tests/Makefile (revision 289172) @@ -1,19 +1,17 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/mkimg - ATF_TESTS_SH= mkimg SOURCES!= cd ${.CURDIR}; echo *.uu FILES= ${SOURCES:S,.gz.uu,,g} FILESDIR= ${TESTSDIR} ${FILES}: uudecode -p ${.CURDIR}/${.TARGET}.gz.uu | gunzip -c > ${.TARGET} CLEANFILES+= ${FILES} rebase: (cd ${.CURDIR}; atf-sh mkimg.sh rebase) .include Index: head/usr.bin/ncal/tests/Makefile =================================================================== --- head/usr.bin/ncal/tests/Makefile (revision 289171) +++ head/usr.bin/ncal/tests/Makefile (revision 289172) @@ -1,99 +1,97 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/ncal - TAP_TESTS_SH= legacy_test FILESDIR= ${TESTSDIR} FILES= regress.b-3m200901-jd-nhl.out FILES+= regress.b-3m200901-md-nhl.out FILES+= regress.b-3m200902-jd-nhl.out FILES+= regress.b-3m200902-md-nhl.out FILES+= regress.b-3m200903-jd-nhl.out FILES+= regress.b-3m200903-md-nhl.out FILES+= regress.b-3m200904-jd-nhl.out FILES+= regress.b-3m200904-md-nhl.out FILES+= regress.b-3m200905-jd-nhl.out FILES+= regress.b-3m200905-md-nhl.out FILES+= regress.b-3m200906-jd-nhl.out FILES+= regress.b-3m200906-md-nhl.out FILES+= regress.b-3m200907-jd-nhl.out FILES+= regress.b-3m200907-md-nhl.out FILES+= regress.b-3m200908-jd-nhl.out FILES+= regress.b-3m200908-md-nhl.out FILES+= regress.b-3m200909-jd-nhl.out FILES+= regress.b-3m200909-md-nhl.out FILES+= regress.b-3m200910-jd-nhl.out FILES+= regress.b-3m200910-md-nhl.out FILES+= regress.b-3m200911-jd-nhl.out FILES+= regress.b-3m200911-md-nhl.out FILES+= regress.b-3m200912-jd-nhl.out FILES+= regress.b-3m200912-md-nhl.out FILES+= regress.b-y2008-jd-nhl.out FILES+= regress.b-y2008-md-nhl.out FILES+= regress.b-y2009-jd-nhl.out FILES+= regress.b-y2009-md-nhl.out FILES+= regress.b-y2010-jd-nhl.out FILES+= regress.b-y2010-md-nhl.out FILES+= regress.b-y2011-jd-nhl.out FILES+= regress.b-y2011-md-nhl.out FILES+= regress.f-3A-nhl.out FILES+= regress.f-3AB-nhl.out FILES+= regress.f-3B-nhl.out FILES+= regress.f-3gy-nhl.out FILES+= regress.f-3y-nhl.out FILES+= regress.f-mgm-nhl.out FILES+= regress.f-yA-nhl.out FILES+= regress.f-yAB-nhl.out FILES+= regress.f-yB-nhl.out FILES+= regress.f-ygm-nhl.out FILES+= regress.f-ym-nhl.out FILES+= regress.r-3m200901-jd-nhl.out FILES+= regress.r-3m200901-md-nhl.out FILES+= regress.r-3m200902-jd-nhl.out FILES+= regress.r-3m200902-md-nhl.out FILES+= regress.r-3m200903-jd-nhl.out FILES+= regress.r-3m200903-md-nhl.out FILES+= regress.r-3m200904-jd-nhl.out FILES+= regress.r-3m200904-md-nhl.out FILES+= regress.r-3m200905-jd-nhl.out FILES+= regress.r-3m200905-md-nhl.out FILES+= regress.r-3m200906-jd-nhl.out FILES+= regress.r-3m200906-md-nhl.out FILES+= regress.r-3m200907-jd-nhl.out FILES+= regress.r-3m200907-md-nhl.out FILES+= regress.r-3m200908-jd-nhl.out FILES+= regress.r-3m200908-md-nhl.out FILES+= regress.r-3m200909-jd-nhl.out FILES+= regress.r-3m200909-md-nhl.out FILES+= regress.r-3m200910-jd-nhl.out FILES+= regress.r-3m200910-md-nhl.out FILES+= regress.r-3m200911-jd-nhl.out FILES+= regress.r-3m200911-md-nhl.out FILES+= regress.r-3m200912-jd-nhl.out FILES+= regress.r-3m200912-md-nhl.out FILES+= regress.r-y2008-jd-nhl.out FILES+= regress.r-y2008-md-nhl.out FILES+= regress.r-y2009-jd-nhl.out FILES+= regress.r-y2009-md-nhl.out FILES+= regress.r-y2010-jd-nhl.out FILES+= regress.r-y2010-md-nhl.out FILES+= regress.r-y2011-jd-nhl.out FILES+= regress.r-y2011-md-nhl.out FILES+= regress.s-b-3-nhl.out FILES+= regress.s-b-A-nhl.out FILES+= regress.s-b-AB-nhl.out FILES+= regress.s-b-B-nhl.out FILES+= regress.s-b-gmgy-nhl.out FILES+= regress.s-b-m-nhl.out FILES+= regress.s-b-mgy-nhl.out FILES+= regress.s-r-3-nhl.out FILES+= regress.s-r-A-nhl.out FILES+= regress.s-r-AB-nhl.out FILES+= regress.s-r-B-nhl.out FILES+= regress.s-r-gmgy-nhl.out FILES+= regress.s-r-m-nhl.out FILES+= regress.s-r-mgy-nhl.out FILES+= regress.sh .include Index: head/usr.bin/printf/tests/Makefile =================================================================== --- head/usr.bin/printf/tests/Makefile (revision 289171) +++ head/usr.bin/printf/tests/Makefile (revision 289172) @@ -1,23 +1,21 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/printf - TAP_TESTS_SH= legacy_test FILESDIR= ${TESTSDIR} FILES= regress.b.out FILES+= regress.d.out FILES+= regress.f.out FILES+= regress.l1.out FILES+= regress.l2.out FILES+= regress.m1.out FILES+= regress.m2.out FILES+= regress.m3.out FILES+= regress.m4.out FILES+= regress.m5.out FILES+= regress.missingpos1.out FILES+= regress.s.out FILES+= regress.sh FILES+= regress.zero.out .include Index: head/usr.bin/sed/tests/Makefile =================================================================== --- head/usr.bin/sed/tests/Makefile (revision 289171) +++ head/usr.bin/sed/tests/Makefile (revision 289172) @@ -1,39 +1,37 @@ # $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" TAP_TESTS_SH+= inplace_race_test FILESDIR= ${TESTSDIR} FILES= hanoi.sed FILES+= math.sed FILES+= regress.G.out FILES+= regress.P.out FILES+= regress.b2a.out FILES+= regress.bcb.out FILES+= regress.c0.out FILES+= regress.c1.out FILES+= regress.c2.out FILES+= regress.c3.out FILES+= regress.hanoi.out FILES+= regress.icase1.out FILES+= regress.icase2.out FILES+= regress.icase3.out FILES+= regress.icase4.out FILES+= regress.in FILES+= regress.math.out FILES+= regress.not.out FILES+= regress.psl.out FILES+= regress.s3.out FILES+= regress.s4.out FILES+= regress.s5.out FILES+= regress.sg.out FILES+= regress.sh FILES+= regress.y.out SUBDIR= regress.multitest.out .include Index: head/usr.bin/soelim/tests/Makefile =================================================================== --- head/usr.bin/soelim/tests/Makefile (revision 289171) +++ head/usr.bin/soelim/tests/Makefile (revision 289172) @@ -1,15 +1,13 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/soelim - ATF_TESTS_SH= soelim FILES= nonexisting.in \ basic.in \ basic \ basic.out \ basic-with-space.in \ basic-with-space.out FILESDIR= ${TESTSDIR} .include Index: head/usr.bin/tests/Makefile =================================================================== --- head/usr.bin/tests/Makefile (revision 289171) +++ head/usr.bin/tests/Makefile (revision 289172) @@ -1,13 +1,11 @@ # $FreeBSD$ .include -TESTSDIR= ${TESTSBASE}/usr.bin - -.PATH: ${.CURDIR:H:H}/tests +.PATH: ${SRCTOP}/tests KYUAFILE= yes FILESDIR= ${TESTSDIR} FILES= regress.m4 .include Index: head/usr.bin/truncate/tests/Makefile =================================================================== --- head/usr.bin/truncate/tests/Makefile (revision 289171) +++ head/usr.bin/truncate/tests/Makefile (revision 289172) @@ -1,6 +1,5 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/truncate -ATF_TESTS_SH= truncate_test +ATF_TESTS_SH= truncate_test .include Index: head/usr.bin/units/tests/Makefile =================================================================== --- head/usr.bin/units/tests/Makefile (revision 289171) +++ head/usr.bin/units/tests/Makefile (revision 289172) @@ -1,9 +1,7 @@ # $FreeBSD$ .include -TESTSDIR= ${TESTSBASE}/usr.bin/units - TAP_TESTS_SH= basics_test .include Index: head/usr.bin/uudecode/tests/Makefile =================================================================== --- head/usr.bin/uudecode/tests/Makefile (revision 289171) +++ head/usr.bin/uudecode/tests/Makefile (revision 289172) @@ -1,13 +1,11 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/uudecode - TAP_TESTS_SH= legacy_test FILESDIR= ${TESTSDIR} FILES= regress.base64.in FILES+= regress.out FILES+= regress.sh FILES+= regress.traditional.in .include Index: head/usr.bin/uuencode/tests/Makefile =================================================================== --- head/usr.bin/uuencode/tests/Makefile (revision 289171) +++ head/usr.bin/uuencode/tests/Makefile (revision 289172) @@ -1,13 +1,11 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/uuencode - TAP_TESTS_SH= legacy_test FILESDIR= ${TESTSDIR} FILES= regress.base64.out FILES+= regress.in FILES+= regress.sh FILES+= regress.traditional.out .include Index: head/usr.bin/xargs/tests/Makefile =================================================================== --- head/usr.bin/xargs/tests/Makefile (revision 289171) +++ head/usr.bin/xargs/tests/Makefile (revision 289172) @@ -1,29 +1,27 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.bin/xargs - TAP_TESTS_SH= legacy_test FILESDIR= ${TESTSDIR} FILES= regress.0.in FILES+= regress.0.out FILES+= regress.0I.out FILES+= regress.0J.out FILES+= regress.0L.out FILES+= regress.0P1.out FILES+= regress.I.out FILES+= regress.J.out FILES+= regress.L.out FILES+= regress.P1.out FILES+= regress.R.out FILES+= regress.in FILES+= regress.n1.out FILES+= regress.n2.out FILES+= regress.n2P0.out FILES+= regress.n3.out FILES+= regress.normal.out FILES+= regress.quotes.in FILES+= regress.quotes.out FILES+= regress.sh .include Index: head/usr.bin/yacc/tests/Makefile =================================================================== --- head/usr.bin/yacc/tests/Makefile (revision 289171) +++ head/usr.bin/yacc/tests/Makefile (revision 289172) @@ -1,334 +1,332 @@ # $FreeBSD$ .include -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 # the testcases will fail unexpectedly. TEST_METADATA.yacc_tests+= required_user="unprivileged" SCRIPTS= run_test SCRIPTSDIR= ${TESTSDIR} CLEANFILES= run_test FILESGROUPS= FILES FILEStest FILEStest_yacc FILEStestDIR= ${TESTSDIR} FILEStest+= btyacc_calc1.y FILEStest+= btyacc_demo.y FILEStest+= calc.y FILEStest+= calc1.y FILEStest+= calc2.y FILEStest+= calc3.y FILEStest+= code_calc.y FILEStest+= code_debug.y FILEStest+= code_error.y FILEStest+= empty.y FILEStest+= err_inherit1.y FILEStest+= err_inherit2.y FILEStest+= err_inherit3.y FILEStest+= err_inherit4.y FILEStest+= err_inherit5.y FILEStest+= err_syntax1.y FILEStest+= err_syntax10.y FILEStest+= err_syntax11.y FILEStest+= err_syntax12.y FILEStest+= err_syntax13.y FILEStest+= err_syntax14.y FILEStest+= err_syntax15.y FILEStest+= err_syntax16.y FILEStest+= err_syntax17.y FILEStest+= err_syntax18.y FILEStest+= err_syntax19.y FILEStest+= err_syntax2.y FILEStest+= err_syntax20.y FILEStest+= err_syntax21.y FILEStest+= err_syntax22.y FILEStest+= err_syntax23.y FILEStest+= err_syntax24.y FILEStest+= err_syntax25.y FILEStest+= err_syntax26.y FILEStest+= err_syntax27.y FILEStest+= err_syntax3.y FILEStest+= err_syntax4.y FILEStest+= err_syntax5.y FILEStest+= err_syntax6.y FILEStest+= err_syntax7.y FILEStest+= err_syntax7a.y FILEStest+= err_syntax7b.y FILEStest+= err_syntax8.y FILEStest+= err_syntax8a.y FILEStest+= err_syntax9.y FILEStest+= error.y FILEStest+= grammar.y FILEStest+= inherit0.y FILEStest+= inherit1.y FILEStest+= inherit2.y FILEStest+= ok_syntax1.y FILEStest+= pure_calc.y FILEStest+= pure_error.y FILEStest+= quote_calc.y FILEStest+= quote_calc2.y FILEStest+= quote_calc3.y FILEStest+= quote_calc4.y FILEStest+= varsyntax_calc1.y FILEStest_yaccDIR= ${TESTSDIR}/yacc FILEStest_yacc+= big_b.error FILEStest_yacc+= big_b.output FILEStest_yacc+= big_l.error FILEStest_yacc+= big_l.output FILEStest_yacc+= calc.error FILEStest_yacc+= calc.output FILEStest_yacc+= calc.tab.c FILEStest_yacc+= calc.tab.h FILEStest_yacc+= calc1.error FILEStest_yacc+= calc1.output FILEStest_yacc+= calc1.tab.c FILEStest_yacc+= calc1.tab.h FILEStest_yacc+= calc2.error FILEStest_yacc+= calc2.output FILEStest_yacc+= calc2.tab.c FILEStest_yacc+= calc2.tab.h FILEStest_yacc+= calc3.error FILEStest_yacc+= calc3.output FILEStest_yacc+= calc3.tab.c FILEStest_yacc+= calc3.tab.h FILEStest_yacc+= code_calc.code.c FILEStest_yacc+= code_calc.error FILEStest_yacc+= code_calc.output FILEStest_yacc+= code_calc.tab.c FILEStest_yacc+= code_calc.tab.h FILEStest_yacc+= code_error.code.c FILEStest_yacc+= code_error.error FILEStest_yacc+= code_error.output FILEStest_yacc+= code_error.tab.c FILEStest_yacc+= code_error.tab.h FILEStest_yacc+= empty.error FILEStest_yacc+= empty.output FILEStest_yacc+= empty.tab.c FILEStest_yacc+= empty.tab.h FILEStest_yacc+= err_syntax1.error FILEStest_yacc+= err_syntax1.output FILEStest_yacc+= err_syntax1.tab.c FILEStest_yacc+= err_syntax1.tab.h FILEStest_yacc+= err_syntax10.error FILEStest_yacc+= err_syntax10.output FILEStest_yacc+= err_syntax10.tab.c FILEStest_yacc+= err_syntax10.tab.h FILEStest_yacc+= err_syntax11.error FILEStest_yacc+= err_syntax11.output FILEStest_yacc+= err_syntax11.tab.c FILEStest_yacc+= err_syntax11.tab.h FILEStest_yacc+= err_syntax12.error FILEStest_yacc+= err_syntax12.output FILEStest_yacc+= err_syntax12.tab.c FILEStest_yacc+= err_syntax12.tab.h FILEStest_yacc+= err_syntax13.error FILEStest_yacc+= err_syntax13.output FILEStest_yacc+= err_syntax13.tab.c FILEStest_yacc+= err_syntax13.tab.h FILEStest_yacc+= err_syntax14.error FILEStest_yacc+= err_syntax14.output FILEStest_yacc+= err_syntax14.tab.c FILEStest_yacc+= err_syntax14.tab.h FILEStest_yacc+= err_syntax15.error FILEStest_yacc+= err_syntax15.output FILEStest_yacc+= err_syntax15.tab.c FILEStest_yacc+= err_syntax15.tab.h FILEStest_yacc+= err_syntax16.error FILEStest_yacc+= err_syntax16.output FILEStest_yacc+= err_syntax16.tab.c FILEStest_yacc+= err_syntax16.tab.h FILEStest_yacc+= err_syntax17.error FILEStest_yacc+= err_syntax17.output FILEStest_yacc+= err_syntax17.tab.c FILEStest_yacc+= err_syntax17.tab.h FILEStest_yacc+= err_syntax18.error FILEStest_yacc+= err_syntax18.output FILEStest_yacc+= err_syntax18.tab.c FILEStest_yacc+= err_syntax18.tab.h FILEStest_yacc+= err_syntax19.error FILEStest_yacc+= err_syntax19.output FILEStest_yacc+= err_syntax19.tab.c FILEStest_yacc+= err_syntax19.tab.h FILEStest_yacc+= err_syntax2.error FILEStest_yacc+= err_syntax2.output FILEStest_yacc+= err_syntax2.tab.c FILEStest_yacc+= err_syntax2.tab.h FILEStest_yacc+= err_syntax20.error FILEStest_yacc+= err_syntax20.output FILEStest_yacc+= err_syntax20.tab.c FILEStest_yacc+= err_syntax20.tab.h FILEStest_yacc+= err_syntax21.error FILEStest_yacc+= err_syntax21.output FILEStest_yacc+= err_syntax21.tab.c FILEStest_yacc+= err_syntax21.tab.h FILEStest_yacc+= err_syntax22.error FILEStest_yacc+= err_syntax22.output FILEStest_yacc+= err_syntax22.tab.c FILEStest_yacc+= err_syntax22.tab.h FILEStest_yacc+= err_syntax23.error FILEStest_yacc+= err_syntax23.output FILEStest_yacc+= err_syntax23.tab.c FILEStest_yacc+= err_syntax23.tab.h FILEStest_yacc+= err_syntax24.error FILEStest_yacc+= err_syntax24.output FILEStest_yacc+= err_syntax24.tab.c FILEStest_yacc+= err_syntax24.tab.h FILEStest_yacc+= err_syntax25.error FILEStest_yacc+= err_syntax25.output FILEStest_yacc+= err_syntax25.tab.c FILEStest_yacc+= err_syntax25.tab.h FILEStest_yacc+= err_syntax26.error FILEStest_yacc+= err_syntax26.output FILEStest_yacc+= err_syntax26.tab.c FILEStest_yacc+= err_syntax26.tab.h FILEStest_yacc+= err_syntax27.error FILEStest_yacc+= err_syntax27.output FILEStest_yacc+= err_syntax27.tab.c FILEStest_yacc+= err_syntax27.tab.h FILEStest_yacc+= err_syntax3.error FILEStest_yacc+= err_syntax3.output FILEStest_yacc+= err_syntax3.tab.c FILEStest_yacc+= err_syntax3.tab.h FILEStest_yacc+= err_syntax4.error FILEStest_yacc+= err_syntax4.output FILEStest_yacc+= err_syntax4.tab.c FILEStest_yacc+= err_syntax4.tab.h FILEStest_yacc+= err_syntax5.error FILEStest_yacc+= err_syntax5.output FILEStest_yacc+= err_syntax5.tab.c FILEStest_yacc+= err_syntax5.tab.h FILEStest_yacc+= err_syntax6.error FILEStest_yacc+= err_syntax6.output FILEStest_yacc+= err_syntax6.tab.c FILEStest_yacc+= err_syntax6.tab.h FILEStest_yacc+= err_syntax7.error FILEStest_yacc+= err_syntax7.output FILEStest_yacc+= err_syntax7.tab.c FILEStest_yacc+= err_syntax7.tab.h FILEStest_yacc+= err_syntax7a.error FILEStest_yacc+= err_syntax7a.output FILEStest_yacc+= err_syntax7a.tab.c FILEStest_yacc+= err_syntax7a.tab.h FILEStest_yacc+= err_syntax7b.error FILEStest_yacc+= err_syntax7b.output FILEStest_yacc+= err_syntax7b.tab.c FILEStest_yacc+= err_syntax7b.tab.h FILEStest_yacc+= err_syntax8.error FILEStest_yacc+= err_syntax8.output FILEStest_yacc+= err_syntax8.tab.c FILEStest_yacc+= err_syntax8.tab.h FILEStest_yacc+= err_syntax8a.error FILEStest_yacc+= err_syntax8a.output FILEStest_yacc+= err_syntax8a.tab.c FILEStest_yacc+= err_syntax8a.tab.h FILEStest_yacc+= err_syntax9.error FILEStest_yacc+= err_syntax9.output FILEStest_yacc+= err_syntax9.tab.c FILEStest_yacc+= err_syntax9.tab.h FILEStest_yacc+= error.error FILEStest_yacc+= error.output FILEStest_yacc+= error.tab.c FILEStest_yacc+= error.tab.h FILEStest_yacc+= grammar.dot FILEStest_yacc+= grammar.error FILEStest_yacc+= grammar.output FILEStest_yacc+= grammar.tab.c FILEStest_yacc+= grammar.tab.h FILEStest_yacc+= help.error FILEStest_yacc+= help.output FILEStest_yacc+= no_b_opt.error FILEStest_yacc+= no_b_opt.output FILEStest_yacc+= no_b_opt1.error FILEStest_yacc+= no_b_opt1.output FILEStest_yacc+= no_code_c.error FILEStest_yacc+= no_code_c.output FILEStest_yacc+= no_defines.error FILEStest_yacc+= no_defines.output FILEStest_yacc+= no_graph.error FILEStest_yacc+= no_graph.output FILEStest_yacc+= no_include.error FILEStest_yacc+= no_include.output FILEStest_yacc+= no_opts.error FILEStest_yacc+= no_opts.output FILEStest_yacc+= no_output.error FILEStest_yacc+= no_output.output FILEStest_yacc+= no_output1.error FILEStest_yacc+= no_output1.output FILEStest_yacc+= no_output2.error FILEStest_yacc+= no_output2.output FILEStest_yacc+= no_p_opt.error FILEStest_yacc+= no_p_opt.output FILEStest_yacc+= no_p_opt1.error FILEStest_yacc+= no_p_opt1.output FILEStest_yacc+= no_verbose.error FILEStest_yacc+= no_verbose.output FILEStest_yacc+= nostdin.error FILEStest_yacc+= nostdin.output FILEStest_yacc+= ok_syntax1.error FILEStest_yacc+= ok_syntax1.output FILEStest_yacc+= ok_syntax1.tab.c FILEStest_yacc+= ok_syntax1.tab.h FILEStest_yacc+= pure_calc.error FILEStest_yacc+= pure_calc.output FILEStest_yacc+= pure_calc.tab.c FILEStest_yacc+= pure_calc.tab.h FILEStest_yacc+= pure_error.error FILEStest_yacc+= pure_error.output FILEStest_yacc+= pure_error.tab.c FILEStest_yacc+= pure_error.tab.h FILEStest_yacc+= quote_calc-s.error FILEStest_yacc+= quote_calc-s.output FILEStest_yacc+= quote_calc-s.tab.c FILEStest_yacc+= quote_calc-s.tab.h FILEStest_yacc+= quote_calc.error FILEStest_yacc+= quote_calc.output FILEStest_yacc+= quote_calc.tab.c FILEStest_yacc+= quote_calc.tab.h FILEStest_yacc+= quote_calc2-s.error FILEStest_yacc+= quote_calc2-s.output FILEStest_yacc+= quote_calc2-s.tab.c FILEStest_yacc+= quote_calc2-s.tab.h FILEStest_yacc+= quote_calc2.error FILEStest_yacc+= quote_calc2.output FILEStest_yacc+= quote_calc2.tab.c FILEStest_yacc+= quote_calc2.tab.h FILEStest_yacc+= quote_calc3-s.error FILEStest_yacc+= quote_calc3-s.output FILEStest_yacc+= quote_calc3-s.tab.c FILEStest_yacc+= quote_calc3-s.tab.h FILEStest_yacc+= quote_calc3.error FILEStest_yacc+= quote_calc3.output FILEStest_yacc+= quote_calc3.tab.c FILEStest_yacc+= quote_calc3.tab.h FILEStest_yacc+= quote_calc4-s.error FILEStest_yacc+= quote_calc4-s.output FILEStest_yacc+= quote_calc4-s.tab.c FILEStest_yacc+= quote_calc4-s.tab.h FILEStest_yacc+= quote_calc4.error FILEStest_yacc+= quote_calc4.output FILEStest_yacc+= quote_calc4.tab.c FILEStest_yacc+= quote_calc4.tab.h FILEStest_yacc+= rename_debug.c FILEStest_yacc+= rename_debug.error FILEStest_yacc+= rename_debug.h FILEStest_yacc+= rename_debug.i FILEStest_yacc+= rename_debug.output FILEStest_yacc+= varsyntax_calc1.error FILEStest_yacc+= varsyntax_calc1.output FILEStest_yacc+= varsyntax_calc1.tab.c FILEStest_yacc+= varsyntax_calc1.tab.h .include Index: head/usr.sbin/etcupdate/tests/Makefile =================================================================== --- head/usr.sbin/etcupdate/tests/Makefile (revision 289171) +++ head/usr.sbin/etcupdate/tests/Makefile (revision 289172) @@ -1,17 +1,15 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.sbin/etcupdate - PLAIN_TESTS_SH= .for test in always_test \ conflicts_test \ fbsdid_test \ ignore_test \ preworld_test \ tests_test \ tzsetup_test PLAIN_TESTS_SH+= ${test} TEST_METADATA.${test}+= required_user="root" .endfor .include Index: head/usr.sbin/fstyp/tests/Makefile =================================================================== --- head/usr.sbin/fstyp/tests/Makefile (revision 289171) +++ head/usr.sbin/fstyp/tests/Makefile (revision 289172) @@ -1,15 +1,13 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.sbin/fstyp - ATF_TESTS_SH= fstyp_test FILES= ext2.img.bz2 FILES+= ext3.img.bz2 FILES+= ext4.img.bz2 FILES+= ext4_with_label.img.bz2 FILES+= ntfs.img.bz2 FILES+= ntfs_with_label.img.bz2 FILESDIR= ${TESTSDIR} .include Index: head/usr.sbin/newsyslog/tests/Makefile =================================================================== --- head/usr.sbin/newsyslog/tests/Makefile (revision 289171) +++ head/usr.sbin/newsyslog/tests/Makefile (revision 289172) @@ -1,7 +1,5 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.sbin/newsyslog - TAP_TESTS_SH= legacy_test .include Index: head/usr.sbin/nmtree/tests/Makefile =================================================================== --- head/usr.sbin/nmtree/tests/Makefile (revision 289171) +++ head/usr.sbin/nmtree/tests/Makefile (revision 289172) @@ -1,32 +1,30 @@ # $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 FILESDIR= ${TESTSDIR} # NOTE: the output from FreeBSD's nmtree displays sha256digest instead of # sha256; we need to mangle the specfiles to reflect this. .for f in mtree_d_create.out netbsd6_d_create.out CLEANFILES+= $f $f.tmp FILES+= $f $f: ${TESTSRC}/$f sed -e 's/sha256/sha256digest/g' < ${.ALLSRC} > ${.TARGET}.tmp mv ${.TARGET}.tmp ${.TARGET} .endfor FILES+= d_convert.in FILES+= d_convert_C.out FILES+= d_convert_C_S.out FILES+= d_convert_D.out FILES+= d_convert_D_S.out FILES+= d_merge.in FILES+= d_merge_C_M.out FILES+= d_merge_C_M_S.out .include Index: head/usr.sbin/pw/tests/Makefile =================================================================== --- head/usr.sbin/pw/tests/Makefile (revision 289171) +++ head/usr.sbin/pw/tests/Makefile (revision 289172) @@ -1,24 +1,22 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.sbin/pw - ATF_TESTS_SH= pw_etcdir \ pw_lock \ pw_config \ pw_groupadd \ pw_groupdel \ pw_groupmod \ pw_useradd \ pw_userdel \ pw_usermod \ pw_usernext .for tp in ${ATF_TESTS_SH} TEST_METADATA.${tp}+= required_user="root" .endfor FILES= group helper_functions.shin master.passwd pw.conf \ pw-modified.conf FILESDIR= ${TESTSDIR} .include Index: head/usr.sbin/sa/tests/Makefile =================================================================== --- head/usr.sbin/sa/tests/Makefile (revision 289171) +++ head/usr.sbin/sa/tests/Makefile (revision 289172) @@ -1,33 +1,31 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.sbin/sa - TAP_TESTS_SH= legacy_test FILESDIR= ${TESTSDIR} FILES= v1-amd64-sav.in FILES+= v1-amd64-sav.out FILES+= v1-amd64-u.out FILES+= v1-amd64-usr.in FILES+= v1-amd64-usr.out FILES+= v1-i386-sav.in FILES+= v1-i386-sav.out FILES+= v1-i386-u.out FILES+= v1-i386-usr.in FILES+= v1-i386-usr.out FILES+= v1-sparc64-sav.in FILES+= v1-sparc64-sav.out FILES+= v1-sparc64-u.out FILES+= v1-sparc64-usr.in FILES+= v1-sparc64-usr.out FILES+= v2-amd64-sav.in FILES+= v2-amd64-u.out FILES+= v2-amd64-usr.in FILES+= v2-i386-sav.in FILES+= v2-i386-u.out FILES+= v2-i386-usr.in FILES+= v2-sparc64-sav.in FILES+= v2-sparc64-u.out FILES+= v2-sparc64-usr.in .include Index: head/usr.sbin/tests/Makefile =================================================================== --- head/usr.sbin/tests/Makefile (revision 289171) +++ head/usr.sbin/tests/Makefile (revision 289172) @@ -1,10 +1,8 @@ # $FreeBSD$ .include -TESTSDIR= ${TESTSBASE}/usr.sbin - -.PATH: ${.CURDIR:H:H}/tests +.PATH: ${SRCTOP}/tests KYUAFILE= yes .include Index: head =================================================================== --- head (revision 289171) +++ head (revision 289172) Property changes on: head ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,2 ## Merged /user/ngie/more-tests:r288932 Merged /user/ngie/more-tests2:r288941