Date: Mon, 12 Oct 2015 08:16:03 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r289172 - in head: bin/cat/tests bin/date/tests bin/expr/tests bin/ls/tests bin/mv/tests bin/pax/tests bin/pkill/tests bin/sh/tests bin/sleep/tests bin/test/tests bin/tests cddl/lib/tes... Message-ID: <201510120816.t9C8G3DZ001516@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Mon Oct 12 08:16:03 2015 New Revision: 289172 URL: https://svnweb.freebsd.org/changeset/base/289172 Log: Refactor the test/ Makefiles after recent changes to bsd.test.mk (r289158) and 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 Modified: head/bin/cat/tests/Makefile head/bin/date/tests/Makefile head/bin/expr/tests/Makefile head/bin/ls/tests/Makefile head/bin/mv/tests/Makefile head/bin/pax/tests/Makefile head/bin/pkill/tests/Makefile head/bin/sh/tests/Makefile head/bin/sleep/tests/Makefile head/bin/test/tests/Makefile head/bin/tests/Makefile head/cddl/lib/tests/Makefile head/cddl/sbin/tests/Makefile head/cddl/tests/Makefile head/cddl/usr.bin/tests/Makefile head/cddl/usr.sbin/dtrace/tests/Makefile head/cddl/usr.sbin/tests/Makefile head/gnu/lib/tests/Makefile head/gnu/tests/Makefile head/gnu/usr.bin/diff/tests/Makefile head/gnu/usr.bin/tests/Makefile head/lib/atf/libatf-c++/tests/Makefile head/lib/atf/libatf-c++/tests/detail/Makefile head/lib/atf/libatf-c/tests/Makefile head/lib/atf/libatf-c/tests/detail/Makefile head/lib/atf/tests/Makefile head/lib/atf/tests/test-programs/Makefile head/lib/libc/tests/Makefile head/lib/libc/tests/Makefile.netbsd-tests head/lib/libc/tests/c063/Makefile head/lib/libc/tests/db/Makefile head/lib/libc/tests/gen/Makefile head/lib/libc/tests/gen/execve/Makefile head/lib/libc/tests/gen/posix_spawn/Makefile head/lib/libc/tests/hash/Makefile head/lib/libc/tests/inet/Makefile head/lib/libc/tests/locale/Makefile head/lib/libc/tests/net/Makefile head/lib/libc/tests/net/getaddrinfo/Makefile head/lib/libc/tests/regex/Makefile head/lib/libc/tests/rpc/Makefile head/lib/libc/tests/setjmp/Makefile head/lib/libc/tests/ssp/Makefile head/lib/libc/tests/stdio/Makefile head/lib/libc/tests/stdlib/Makefile head/lib/libc/tests/string/Makefile head/lib/libc/tests/sys/Makefile head/lib/libc/tests/termios/Makefile head/lib/libc/tests/time/Makefile head/lib/libc/tests/tls/Makefile head/lib/libc/tests/tls/dso/Makefile head/lib/libc/tests/tls_dso/Makefile head/lib/libc/tests/ttyio/Makefile head/lib/libcrypt/tests/Makefile head/lib/libmp/tests/Makefile head/lib/libnv/tests/Makefile head/lib/libpam/libpam/tests/Makefile head/lib/libproc/tests/Makefile head/lib/librt/tests/Makefile head/lib/libthr/tests/Makefile head/lib/libthr/tests/dlopen/Makefile head/lib/libthr/tests/dlopen/dso/Makefile head/lib/libutil/tests/Makefile head/lib/msun/tests/Makefile head/lib/tests/Makefile head/libexec/atf/atf-check/tests/Makefile head/libexec/atf/atf-sh/tests/Makefile head/libexec/atf/tests/Makefile head/libexec/rtld-elf/tests/Makefile head/libexec/tests/Makefile head/sbin/devd/tests/Makefile head/sbin/dhclient/tests/Makefile head/sbin/growfs/tests/Makefile head/sbin/ifconfig/tests/Makefile head/sbin/mdconfig/tests/Makefile head/sbin/tests/Makefile head/secure/lib/tests/Makefile head/secure/libexec/tests/Makefile head/secure/tests/Makefile head/secure/usr.bin/tests/Makefile head/secure/usr.sbin/tests/Makefile head/share/examples/tests/Makefile head/share/tests/Makefile head/tests/etc/Makefile head/tests/sys/mqueue/Makefile head/tests/sys/pjdfstest/tests/Makefile head/usr.bin/apply/tests/Makefile head/usr.bin/basename/tests/Makefile head/usr.bin/calendar/tests/Makefile head/usr.bin/cmp/tests/Makefile head/usr.bin/col/tests/Makefile head/usr.bin/comm/tests/Makefile head/usr.bin/cut/tests/Makefile head/usr.bin/dirname/tests/Makefile head/usr.bin/file2c/tests/Makefile head/usr.bin/grep/tests/Makefile head/usr.bin/gzip/tests/Makefile head/usr.bin/ident/tests/Makefile head/usr.bin/join/tests/Makefile head/usr.bin/jot/tests/Makefile head/usr.bin/lastcomm/tests/Makefile head/usr.bin/m4/tests/Makefile head/usr.bin/mkimg/tests/Makefile head/usr.bin/ncal/tests/Makefile head/usr.bin/printf/tests/Makefile head/usr.bin/sed/tests/Makefile head/usr.bin/soelim/tests/Makefile head/usr.bin/tests/Makefile head/usr.bin/truncate/tests/Makefile head/usr.bin/units/tests/Makefile head/usr.bin/uudecode/tests/Makefile head/usr.bin/uuencode/tests/Makefile head/usr.bin/xargs/tests/Makefile head/usr.bin/yacc/tests/Makefile head/usr.sbin/etcupdate/tests/Makefile head/usr.sbin/fstyp/tests/Makefile head/usr.sbin/newsyslog/tests/Makefile head/usr.sbin/nmtree/tests/Makefile head/usr.sbin/pw/tests/Makefile head/usr.sbin/sa/tests/Makefile head/usr.sbin/tests/Makefile Directory Properties: head/ (props changed) Modified: head/bin/cat/tests/Makefile ============================================================================== --- head/bin/cat/tests/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/bin/cat/tests/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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} Modified: head/bin/date/tests/Makefile ============================================================================== --- head/bin/date/tests/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/bin/date/tests/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -2,8 +2,6 @@ .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/bin/date - ATF_TESTS_SH= format_string_test .include <bsd.test.mk> Modified: head/bin/expr/tests/Makefile ============================================================================== --- head/bin/expr/tests/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/bin/expr/tests/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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' Modified: head/bin/ls/tests/Makefile ============================================================================== --- head/bin/ls/tests/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/bin/ls/tests/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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 Modified: head/bin/mv/tests/Makefile ============================================================================== --- head/bin/mv/tests/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/bin/mv/tests/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -2,8 +2,6 @@ .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/bin/mv - TAP_TESTS_SH= legacy_test .include <bsd.test.mk> Modified: head/bin/pax/tests/Makefile ============================================================================== --- head/bin/pax/tests/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/bin/pax/tests/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -2,8 +2,6 @@ .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/bin/pax - TAP_TESTS_PERL= legacy_test .include <bsd.test.mk> Modified: head/bin/pkill/tests/Makefile ============================================================================== --- head/bin/pkill/tests/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/bin/pkill/tests/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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 Modified: head/bin/sh/tests/Makefile ============================================================================== --- head/bin/sh/tests/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/bin/sh/tests/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -2,8 +2,6 @@ .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/bin/sh - TESTS_SUBDIRS+= builtins TESTS_SUBDIRS+= errors TESTS_SUBDIRS+= execution Modified: head/bin/sleep/tests/Makefile ============================================================================== --- head/bin/sleep/tests/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/bin/sleep/tests/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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> Modified: head/bin/test/tests/Makefile ============================================================================== --- head/bin/test/tests/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/bin/test/tests/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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. Modified: head/bin/tests/Makefile ============================================================================== --- head/bin/tests/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/bin/tests/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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> Modified: head/cddl/lib/tests/Makefile ============================================================================== --- head/cddl/lib/tests/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/cddl/lib/tests/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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> Modified: head/cddl/sbin/tests/Makefile ============================================================================== --- head/cddl/sbin/tests/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/cddl/sbin/tests/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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> Modified: head/cddl/tests/Makefile ============================================================================== --- head/cddl/tests/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/cddl/tests/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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> Modified: head/cddl/usr.bin/tests/Makefile ============================================================================== --- head/cddl/usr.bin/tests/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/cddl/usr.bin/tests/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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> Modified: head/cddl/usr.sbin/dtrace/tests/Makefile ============================================================================== --- head/cddl/usr.sbin/dtrace/tests/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/cddl/usr.sbin/dtrace/tests/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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 Modified: head/cddl/usr.sbin/tests/Makefile ============================================================================== --- head/cddl/usr.sbin/tests/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/cddl/usr.sbin/tests/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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> Modified: head/gnu/lib/tests/Makefile ============================================================================== --- head/gnu/lib/tests/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/gnu/lib/tests/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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> Modified: head/gnu/tests/Makefile ============================================================================== --- head/gnu/tests/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/gnu/tests/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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> Modified: head/gnu/usr.bin/diff/tests/Makefile ============================================================================== --- head/gnu/usr.bin/diff/tests/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/gnu/usr.bin/diff/tests/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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> Modified: head/gnu/usr.bin/tests/Makefile ============================================================================== --- head/gnu/usr.bin/tests/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/gnu/usr.bin/tests/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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> Modified: head/lib/atf/libatf-c++/tests/Makefile ============================================================================== --- head/lib/atf/libatf-c++/tests/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/lib/atf/libatf-c++/tests/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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 Modified: head/lib/atf/libatf-c++/tests/detail/Makefile ============================================================================== --- head/lib/atf/libatf-c++/tests/detail/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/lib/atf/libatf-c++/tests/detail/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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"' Modified: head/lib/atf/libatf-c/tests/Makefile ============================================================================== --- head/lib/atf/libatf-c/tests/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/lib/atf/libatf-c/tests/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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 Modified: head/lib/atf/libatf-c/tests/detail/Makefile ============================================================================== --- head/lib/atf/libatf-c/tests/detail/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/lib/atf/libatf-c/tests/detail/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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}"' Modified: head/lib/atf/tests/Makefile ============================================================================== --- head/lib/atf/tests/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/lib/atf/tests/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -4,7 +4,7 @@ TESTSDIR= ${TESTSBASE}/lib/atf -.PATH: ${.CURDIR:H:H:H}/tests +.PATH: ${SRCTOP}/tests KYUAFILE= yes SUBDIR= test-programs Modified: head/lib/atf/tests/test-programs/Makefile ============================================================================== --- head/lib/atf/tests/test-programs/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/lib/atf/tests/test-programs/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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} Modified: head/lib/libc/tests/Makefile ============================================================================== --- head/lib/libc/tests/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/lib/libc/tests/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -2,8 +2,6 @@ .include <src.opts.mk> -TESTSDIR= ${TESTSBASE}/lib/libc - SUBDIR= tls_dso TESTS_SUBDIRS= c063 Modified: head/lib/libc/tests/Makefile.netbsd-tests ============================================================================== --- head/lib/libc/tests/Makefile.netbsd-tests Mon Oct 12 07:53:04 2015 (r289171) +++ head/lib/libc/tests/Makefile.netbsd-tests Mon Oct 12 08:16:03 2015 (r289172) @@ -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> Modified: head/lib/libc/tests/c063/Makefile ============================================================================== --- head/lib/libc/tests/c063/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/lib/libc/tests/c063/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -1,7 +1,5 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/lib/libc/c063 - #TODO: t_o_search NETBSD_ATF_TESTS_C= faccessat Modified: head/lib/libc/tests/db/Makefile ============================================================================== --- head/lib/libc/tests/db/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/lib/libc/tests/db/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -1,7 +1,5 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/lib/libc/db - BINDIR= ${TESTSDIR} PROGS= h_db Modified: head/lib/libc/tests/gen/Makefile ============================================================================== --- head/lib/libc/tests/gen/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/lib/libc/tests/gen/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -2,8 +2,6 @@ .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/lib/libc/gen - ATF_TESTS_C= arc4random_test ATF_TESTS_C+= fpclassify2_test Modified: head/lib/libc/tests/gen/execve/Makefile ============================================================================== --- head/lib/libc/tests/gen/execve/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/lib/libc/tests/gen/execve/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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" Modified: head/lib/libc/tests/gen/posix_spawn/Makefile ============================================================================== --- head/lib/libc/tests/gen/posix_spawn/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/lib/libc/tests/gen/posix_spawn/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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 Modified: head/lib/libc/tests/hash/Makefile ============================================================================== --- head/lib/libc/tests/hash/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/lib/libc/tests/hash/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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" Modified: head/lib/libc/tests/inet/Makefile ============================================================================== --- head/lib/libc/tests/inet/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/lib/libc/tests/inet/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -2,8 +2,6 @@ .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/lib/libc/inet - NETBSD_ATF_TESTS_C= inet_network_test .include "../Makefile.netbsd-tests" Modified: head/lib/libc/tests/locale/Makefile ============================================================================== --- head/lib/libc/tests/locale/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/lib/libc/tests/locale/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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 Modified: head/lib/libc/tests/net/Makefile ============================================================================== --- head/lib/libc/tests/net/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/lib/libc/tests/net/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -2,8 +2,6 @@ .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/lib/libc/net - BINDIR= ${TESTSDIR} NETBSD_ATF_TESTS_C= getprotoent_test Modified: head/lib/libc/tests/net/getaddrinfo/Makefile ============================================================================== --- head/lib/libc/tests/net/getaddrinfo/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/lib/libc/tests/net/getaddrinfo/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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)" Modified: head/lib/libc/tests/regex/Makefile ============================================================================== --- head/lib/libc/tests/regex/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/lib/libc/tests/regex/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -4,8 +4,6 @@ BINDIR= ${TESTSDIR} -TESTSDIR= ${TESTSBASE}/lib/libc/regex - IMPLEMENTATION?= -DREGEX_SPENCER CFLAGS.h_regex+=-I${TESTSRC} -I${.CURDIR:H:H}/regex Modified: head/lib/libc/tests/rpc/Makefile ============================================================================== --- head/lib/libc/tests/rpc/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/lib/libc/tests/rpc/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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 Modified: head/lib/libc/tests/setjmp/Makefile ============================================================================== --- head/lib/libc/tests/setjmp/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/lib/libc/tests/setjmp/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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> Modified: head/lib/libc/tests/ssp/Makefile ============================================================================== --- head/lib/libc/tests/ssp/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/lib/libc/tests/ssp/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -2,8 +2,6 @@ .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/lib/libc/ssp - NO_WERROR= WARNS?= 2 Modified: head/lib/libc/tests/stdio/Makefile ============================================================================== --- head/lib/libc/tests/stdio/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/lib/libc/tests/stdio/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -1,7 +1,5 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/lib/libc/stdio - ATF_TESTS_C= fmemopen2_test NETBSD_ATF_TESTS_C= clearerr_test Modified: head/lib/libc/tests/stdlib/Makefile ============================================================================== --- head/lib/libc/tests/stdlib/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/lib/libc/tests/stdlib/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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 Modified: head/lib/libc/tests/string/Makefile ============================================================================== --- head/lib/libc/tests/string/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/lib/libc/tests/string/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -2,8 +2,6 @@ .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/lib/libc/string - # TODO: popcount, stresep NETBSD_ATF_TESTS_C+= memchr Modified: head/lib/libc/tests/sys/Makefile ============================================================================== --- head/lib/libc/tests/sys/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/lib/libc/tests/sys/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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 Modified: head/lib/libc/tests/termios/Makefile ============================================================================== --- head/lib/libc/tests/termios/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/lib/libc/tests/termios/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -2,8 +2,6 @@ .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/lib/libc/termios - NETBSD_ATF_TESTS_C= tcsetpgrp_test .include "../Makefile.netbsd-tests" Modified: head/lib/libc/tests/time/Makefile ============================================================================== --- head/lib/libc/tests/time/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/lib/libc/tests/time/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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 Modified: head/lib/libc/tests/tls/Makefile ============================================================================== --- head/lib/libc/tests/tls/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/lib/libc/tests/tls/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -2,7 +2,6 @@ .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/lib/libc/tls .if !defined(NO_PIC) SUBDIR+= dso .endif Modified: head/lib/libc/tests/tls/dso/Makefile ============================================================================== --- head/lib/libc/tests/tls/dso/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/lib/libc/tests/tls/dso/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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 Modified: head/lib/libc/tests/tls_dso/Makefile ============================================================================== --- head/lib/libc/tests/tls_dso/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/lib/libc/tests/tls_dso/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -1,5 +1,7 @@ # $FreeBSD$ +SRCDIR= ${SRCTOP}/contrib/netbsd/ + .include <bsd.own.mk> LIB= h_tls_dynamic Modified: head/lib/libc/tests/ttyio/Makefile ============================================================================== --- head/lib/libc/tests/ttyio/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/lib/libc/tests/ttyio/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -2,8 +2,6 @@ .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/lib/libc/ttyio - # TODO: ptm_test NETBSD_ATF_TESTS_C= ttyio_test Modified: head/lib/libcrypt/tests/Makefile ============================================================================== --- head/lib/libcrypt/tests/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/lib/libcrypt/tests/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -2,8 +2,6 @@ # exercise libcrypt -TESTSDIR= ${TESTSBASE}/lib/libcrypt - ATF_TESTS_C= crypt_tests CFLAGS+= -I${.CURDIR:H} Modified: head/lib/libmp/tests/Makefile ============================================================================== --- head/lib/libmp/tests/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/lib/libmp/tests/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -1,7 +1,5 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/lib/libmp - TAP_TESTS_C+= legacy_test LIBADD+= mp Modified: head/lib/libnv/tests/Makefile ============================================================================== --- head/lib/libnv/tests/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/lib/libnv/tests/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -1,7 +1,5 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/lib/libnv - ATF_TESTS_CXX= \ dnv_tests \ nv_array_tests \ Modified: head/lib/libpam/libpam/tests/Makefile ============================================================================== --- head/lib/libpam/libpam/tests/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/lib/libpam/libpam/tests/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -1,6 +1,6 @@ # $FreeBSD$ -OPENPAM = ${.CURDIR}/../../../../contrib/openpam +OPENPAM= ${SRCTOP}/contrib/openpam .PATH: ${OPENPAM}/t TESTSDIR = ${TESTSBASE}/lib/libpam Modified: head/lib/libproc/tests/Makefile ============================================================================== --- head/lib/libproc/tests/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/lib/libproc/tests/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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_D # for testing symbol lookup. STRIP= -MAN= WARNS?= 6 .include <bsd.test.mk> Modified: head/lib/librt/tests/Makefile ============================================================================== --- head/lib/librt/tests/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/lib/librt/tests/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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 Modified: head/lib/libthr/tests/Makefile ============================================================================== --- head/lib/libthr/tests/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/lib/libthr/tests/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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 Modified: head/lib/libthr/tests/dlopen/Makefile ============================================================================== --- head/lib/libthr/tests/dlopen/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/lib/libthr/tests/dlopen/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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> Modified: head/lib/libthr/tests/dlopen/dso/Makefile ============================================================================== --- head/lib/libthr/tests/dlopen/dso/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/lib/libthr/tests/dlopen/dso/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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 Modified: head/lib/libutil/tests/Makefile ============================================================================== --- head/lib/libutil/tests/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/lib/libutil/tests/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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 Modified: head/lib/msun/tests/Makefile ============================================================================== --- head/lib/msun/tests/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/lib/msun/tests/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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 Modified: head/lib/tests/Makefile ============================================================================== --- head/lib/tests/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/lib/tests/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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> Modified: head/libexec/atf/atf-check/tests/Makefile ============================================================================== --- head/libexec/atf/atf-check/tests/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/libexec/atf/atf-check/tests/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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 Modified: head/libexec/atf/atf-sh/tests/Makefile ============================================================================== --- head/libexec/atf/atf-sh/tests/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/libexec/atf/atf-sh/tests/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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 Modified: head/libexec/atf/tests/Makefile ============================================================================== --- head/libexec/atf/tests/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/libexec/atf/tests/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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> Modified: head/libexec/rtld-elf/tests/Makefile ============================================================================== --- head/libexec/rtld-elf/tests/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/libexec/rtld-elf/tests/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -2,7 +2,6 @@ .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/libexec/rtld-elf SUBDIR+= libpythagoras target ATF_TESTS_C= ld_library_pathfds Modified: head/libexec/tests/Makefile ============================================================================== --- head/libexec/tests/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/libexec/tests/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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> Modified: head/sbin/devd/tests/Makefile ============================================================================== --- head/sbin/devd/tests/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/sbin/devd/tests/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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" Modified: head/sbin/dhclient/tests/Makefile ============================================================================== --- head/sbin/dhclient/tests/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/sbin/dhclient/tests/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -1,7 +1,5 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/sbin/dhclient - .PATH: ${.CURDIR}/.. PLAIN_TESTS_C= option-domain-search_test Modified: head/sbin/growfs/tests/Makefile ============================================================================== --- head/sbin/growfs/tests/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/sbin/growfs/tests/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -1,7 +1,5 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/sbin/growfs - TAP_TESTS_PERL= legacy_test .include <bsd.test.mk> Modified: head/sbin/ifconfig/tests/Makefile ============================================================================== --- head/sbin/ifconfig/tests/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/sbin/ifconfig/tests/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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> Modified: head/sbin/mdconfig/tests/Makefile ============================================================================== --- head/sbin/mdconfig/tests/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/sbin/mdconfig/tests/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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> Modified: head/sbin/tests/Makefile ============================================================================== --- head/sbin/tests/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/sbin/tests/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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> Modified: head/secure/lib/tests/Makefile ============================================================================== --- head/secure/lib/tests/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/secure/lib/tests/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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> Modified: head/secure/libexec/tests/Makefile ============================================================================== --- head/secure/libexec/tests/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/secure/libexec/tests/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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> Modified: head/secure/tests/Makefile ============================================================================== --- head/secure/tests/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/secure/tests/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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> Modified: head/secure/usr.bin/tests/Makefile ============================================================================== --- head/secure/usr.bin/tests/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/secure/usr.bin/tests/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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> Modified: head/secure/usr.sbin/tests/Makefile ============================================================================== --- head/secure/usr.sbin/tests/Makefile Mon Oct 12 07:53:04 2015 (r289171) +++ head/secure/usr.sbin/tests/Makefile Mon Oct 12 08:16:03 2015 (r289172) @@ -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> *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510120816.t9C8G3DZ001516>