Date: Thu, 9 Feb 2017 22:49:48 +0000 (UTC) From: Ngie Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r313488 - in stable/10: 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/li... Message-ID: <201702092249.v19MnmtK006121@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Thu Feb 9 22:49:48 2017 New Revision: 313488 URL: https://svnweb.freebsd.org/changeset/base/313488 Log: MFC r289172,r290254: r289172: 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 r290254: Remove unused variable (SRCDIR) Modified: stable/10/bin/cat/tests/Makefile stable/10/bin/date/tests/Makefile stable/10/bin/expr/tests/Makefile stable/10/bin/ls/tests/Makefile stable/10/bin/mv/tests/Makefile stable/10/bin/pax/tests/Makefile stable/10/bin/pkill/tests/Makefile stable/10/bin/sh/tests/Makefile stable/10/bin/sleep/tests/Makefile stable/10/bin/test/tests/Makefile stable/10/bin/tests/Makefile stable/10/cddl/lib/tests/Makefile stable/10/cddl/sbin/tests/Makefile stable/10/cddl/tests/Makefile stable/10/cddl/usr.bin/tests/Makefile stable/10/cddl/usr.sbin/dtrace/tests/Makefile stable/10/cddl/usr.sbin/tests/Makefile stable/10/gnu/lib/tests/Makefile stable/10/gnu/tests/Makefile stable/10/gnu/usr.bin/diff/tests/Makefile stable/10/gnu/usr.bin/tests/Makefile stable/10/lib/atf/libatf-c++/tests/Makefile stable/10/lib/atf/libatf-c++/tests/detail/Makefile stable/10/lib/atf/libatf-c/tests/Makefile stable/10/lib/atf/libatf-c/tests/detail/Makefile stable/10/lib/atf/tests/Makefile stable/10/lib/atf/tests/test-programs/Makefile stable/10/lib/libc/tests/Makefile stable/10/lib/libc/tests/Makefile.netbsd-tests stable/10/lib/libc/tests/c063/Makefile stable/10/lib/libc/tests/db/Makefile stable/10/lib/libc/tests/gen/Makefile stable/10/lib/libc/tests/gen/execve/Makefile stable/10/lib/libc/tests/gen/posix_spawn/Makefile stable/10/lib/libc/tests/hash/Makefile stable/10/lib/libc/tests/inet/Makefile stable/10/lib/libc/tests/locale/Makefile stable/10/lib/libc/tests/net/Makefile stable/10/lib/libc/tests/net/getaddrinfo/Makefile stable/10/lib/libc/tests/regex/Makefile stable/10/lib/libc/tests/rpc/Makefile stable/10/lib/libc/tests/setjmp/Makefile stable/10/lib/libc/tests/ssp/Makefile stable/10/lib/libc/tests/stdio/Makefile stable/10/lib/libc/tests/stdlib/Makefile stable/10/lib/libc/tests/string/Makefile stable/10/lib/libc/tests/sys/Makefile stable/10/lib/libc/tests/termios/Makefile stable/10/lib/libc/tests/time/Makefile stable/10/lib/libc/tests/tls/Makefile stable/10/lib/libc/tests/tls/dso/Makefile stable/10/lib/libc/tests/ttyio/Makefile stable/10/lib/libcrypt/tests/Makefile stable/10/lib/libmp/tests/Makefile stable/10/lib/libnv/tests/Makefile stable/10/lib/libpam/libpam/tests/Makefile stable/10/lib/librt/tests/Makefile stable/10/lib/libthr/tests/Makefile stable/10/lib/libthr/tests/dlopen/Makefile stable/10/lib/libthr/tests/dlopen/dso/Makefile stable/10/lib/libutil/tests/Makefile stable/10/lib/msun/tests/Makefile stable/10/lib/tests/Makefile stable/10/libexec/atf/atf-check/tests/Makefile stable/10/libexec/atf/atf-sh/tests/Makefile stable/10/libexec/atf/tests/Makefile stable/10/libexec/tests/Makefile stable/10/sbin/devd/tests/Makefile stable/10/sbin/dhclient/tests/Makefile stable/10/sbin/growfs/tests/Makefile stable/10/sbin/mdconfig/tests/Makefile stable/10/sbin/tests/Makefile stable/10/secure/lib/tests/Makefile stable/10/secure/libexec/tests/Makefile stable/10/secure/tests/Makefile stable/10/secure/usr.bin/tests/Makefile stable/10/secure/usr.sbin/tests/Makefile stable/10/share/examples/tests/Makefile stable/10/share/tests/Makefile stable/10/tests/etc/Makefile stable/10/tests/sys/mqueue/Makefile stable/10/tests/sys/pjdfstest/tests/Makefile stable/10/usr.bin/apply/tests/Makefile stable/10/usr.bin/basename/tests/Makefile stable/10/usr.bin/calendar/tests/Makefile stable/10/usr.bin/cmp/tests/Makefile stable/10/usr.bin/col/tests/Makefile stable/10/usr.bin/comm/tests/Makefile stable/10/usr.bin/cut/tests/Makefile stable/10/usr.bin/dirname/tests/Makefile stable/10/usr.bin/file2c/tests/Makefile stable/10/usr.bin/grep/tests/Makefile stable/10/usr.bin/gzip/tests/Makefile stable/10/usr.bin/join/tests/Makefile stable/10/usr.bin/jot/tests/Makefile stable/10/usr.bin/lastcomm/tests/Makefile stable/10/usr.bin/m4/tests/Makefile stable/10/usr.bin/ncal/tests/Makefile stable/10/usr.bin/printf/tests/Makefile stable/10/usr.bin/sed/tests/Makefile stable/10/usr.bin/tests/Makefile stable/10/usr.bin/truncate/tests/Makefile stable/10/usr.bin/uudecode/tests/Makefile stable/10/usr.bin/uuencode/tests/Makefile stable/10/usr.bin/xargs/tests/Makefile stable/10/usr.bin/yacc/tests/Makefile stable/10/usr.sbin/etcupdate/tests/Makefile stable/10/usr.sbin/fstyp/tests/Makefile stable/10/usr.sbin/newsyslog/tests/Makefile stable/10/usr.sbin/nmtree/tests/Makefile stable/10/usr.sbin/pw/tests/Makefile stable/10/usr.sbin/sa/tests/Makefile stable/10/usr.sbin/tests/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/bin/cat/tests/Makefile ============================================================================== --- stable/10/bin/cat/tests/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/bin/cat/tests/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -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: stable/10/bin/date/tests/Makefile ============================================================================== --- stable/10/bin/date/tests/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/bin/date/tests/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -2,8 +2,6 @@ .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/bin/date - ATF_TESTS_SH= format_string_test .include <bsd.test.mk> Modified: stable/10/bin/expr/tests/Makefile ============================================================================== --- stable/10/bin/expr/tests/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/bin/expr/tests/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -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: stable/10/bin/ls/tests/Makefile ============================================================================== --- stable/10/bin/ls/tests/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/bin/ls/tests/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -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: stable/10/bin/mv/tests/Makefile ============================================================================== --- stable/10/bin/mv/tests/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/bin/mv/tests/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -2,8 +2,6 @@ .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/bin/mv - TAP_TESTS_SH= legacy_test .include <bsd.test.mk> Modified: stable/10/bin/pax/tests/Makefile ============================================================================== --- stable/10/bin/pax/tests/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/bin/pax/tests/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -2,8 +2,6 @@ .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/bin/pax - TAP_TESTS_PERL= legacy_test .include <bsd.test.mk> Modified: stable/10/bin/pkill/tests/Makefile ============================================================================== --- stable/10/bin/pkill/tests/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/bin/pkill/tests/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -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: stable/10/bin/sh/tests/Makefile ============================================================================== --- stable/10/bin/sh/tests/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/bin/sh/tests/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -2,8 +2,6 @@ .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/bin/sh - TESTS_SUBDIRS+= builtins TESTS_SUBDIRS+= errors TESTS_SUBDIRS+= execution Modified: stable/10/bin/sleep/tests/Makefile ============================================================================== --- stable/10/bin/sleep/tests/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/bin/sleep/tests/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -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: stable/10/bin/test/tests/Makefile ============================================================================== --- stable/10/bin/test/tests/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/bin/test/tests/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -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: stable/10/bin/tests/Makefile ============================================================================== --- stable/10/bin/tests/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/bin/tests/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -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: stable/10/cddl/lib/tests/Makefile ============================================================================== --- stable/10/cddl/lib/tests/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/cddl/lib/tests/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -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: stable/10/cddl/sbin/tests/Makefile ============================================================================== --- stable/10/cddl/sbin/tests/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/cddl/sbin/tests/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -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: stable/10/cddl/tests/Makefile ============================================================================== --- stable/10/cddl/tests/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/cddl/tests/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -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: stable/10/cddl/usr.bin/tests/Makefile ============================================================================== --- stable/10/cddl/usr.bin/tests/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/cddl/usr.bin/tests/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -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: stable/10/cddl/usr.sbin/dtrace/tests/Makefile ============================================================================== --- stable/10/cddl/usr.sbin/dtrace/tests/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/cddl/usr.sbin/dtrace/tests/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -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: stable/10/cddl/usr.sbin/tests/Makefile ============================================================================== --- stable/10/cddl/usr.sbin/tests/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/cddl/usr.sbin/tests/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -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: stable/10/gnu/lib/tests/Makefile ============================================================================== --- stable/10/gnu/lib/tests/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/gnu/lib/tests/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -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: stable/10/gnu/tests/Makefile ============================================================================== --- stable/10/gnu/tests/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/gnu/tests/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -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: stable/10/gnu/usr.bin/diff/tests/Makefile ============================================================================== --- stable/10/gnu/usr.bin/diff/tests/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/gnu/usr.bin/diff/tests/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -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: stable/10/gnu/usr.bin/tests/Makefile ============================================================================== --- stable/10/gnu/usr.bin/tests/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/gnu/usr.bin/tests/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -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: stable/10/lib/atf/libatf-c++/tests/Makefile ============================================================================== --- stable/10/lib/atf/libatf-c++/tests/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/lib/atf/libatf-c++/tests/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -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: stable/10/lib/atf/libatf-c++/tests/detail/Makefile ============================================================================== --- stable/10/lib/atf/libatf-c++/tests/detail/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/lib/atf/libatf-c++/tests/detail/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -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: stable/10/lib/atf/libatf-c/tests/Makefile ============================================================================== --- stable/10/lib/atf/libatf-c/tests/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/lib/atf/libatf-c/tests/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -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: stable/10/lib/atf/libatf-c/tests/detail/Makefile ============================================================================== --- stable/10/lib/atf/libatf-c/tests/detail/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/lib/atf/libatf-c/tests/detail/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -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: stable/10/lib/atf/tests/Makefile ============================================================================== --- stable/10/lib/atf/tests/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/lib/atf/tests/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -4,7 +4,7 @@ TESTSDIR= ${TESTSBASE}/lib/atf -.PATH: ${.CURDIR:H:H:H}/tests +.PATH: ${SRCTOP}/tests KYUAFILE= yes SUBDIR= test-programs Modified: stable/10/lib/atf/tests/test-programs/Makefile ============================================================================== --- stable/10/lib/atf/tests/test-programs/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/lib/atf/tests/test-programs/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -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: stable/10/lib/libc/tests/Makefile ============================================================================== --- stable/10/lib/libc/tests/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/lib/libc/tests/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -2,8 +2,6 @@ .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/lib/libc - SUBDIR= tls_dso TESTS_SUBDIRS= c063 Modified: stable/10/lib/libc/tests/Makefile.netbsd-tests ============================================================================== --- stable/10/lib/libc/tests/Makefile.netbsd-tests Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/lib/libc/tests/Makefile.netbsd-tests Thu Feb 9 22:49:48 2017 (r313488) @@ -1,8 +1,8 @@ # $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/} WARNS?= 2 Modified: stable/10/lib/libc/tests/c063/Makefile ============================================================================== --- stable/10/lib/libc/tests/c063/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/lib/libc/tests/c063/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -1,7 +1,5 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/lib/libc/c063 - #TODO: t_o_search NETBSD_ATF_TESTS_C= faccessat_test Modified: stable/10/lib/libc/tests/db/Makefile ============================================================================== --- stable/10/lib/libc/tests/db/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/lib/libc/tests/db/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -1,7 +1,5 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/lib/libc/db - BINDIR= ${TESTSDIR} PROGS= h_db Modified: stable/10/lib/libc/tests/gen/Makefile ============================================================================== --- stable/10/lib/libc/tests/gen/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/lib/libc/tests/gen/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -2,8 +2,6 @@ .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/lib/libc/gen - ATF_TESTS_C+= arc4random_test ATF_TESTS_C+= fmtcheck2_test ATF_TESTS_C+= fmtmsg_test Modified: stable/10/lib/libc/tests/gen/execve/Makefile ============================================================================== --- stable/10/lib/libc/tests/gen/execve/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/lib/libc/tests/gen/execve/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -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: stable/10/lib/libc/tests/gen/posix_spawn/Makefile ============================================================================== --- stable/10/lib/libc/tests/gen/posix_spawn/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/lib/libc/tests/gen/posix_spawn/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -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: stable/10/lib/libc/tests/hash/Makefile ============================================================================== --- stable/10/lib/libc/tests/hash/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/lib/libc/tests/hash/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -2,8 +2,6 @@ .include <bsd.own.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: stable/10/lib/libc/tests/inet/Makefile ============================================================================== --- stable/10/lib/libc/tests/inet/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/lib/libc/tests/inet/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -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: stable/10/lib/libc/tests/locale/Makefile ============================================================================== --- stable/10/lib/libc/tests/locale/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/lib/libc/tests/locale/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -2,8 +2,6 @@ .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/lib/libc/locale - ATF_TESTS_C+= btowc_test ATF_TESTS_C+= c16rtomb_test ATF_TESTS_C+= iswctype_test Modified: stable/10/lib/libc/tests/net/Makefile ============================================================================== --- stable/10/lib/libc/tests/net/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/lib/libc/tests/net/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -1,7 +1,5 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/lib/libc/net - ATF_TESTS_C+= ether_test ATF_TESTS_C+= eui64_aton_test ATF_TESTS_C+= eui64_ntoa_test Modified: stable/10/lib/libc/tests/net/getaddrinfo/Makefile ============================================================================== --- stable/10/lib/libc/tests/net/getaddrinfo/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/lib/libc/tests/net/getaddrinfo/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -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: stable/10/lib/libc/tests/regex/Makefile ============================================================================== --- stable/10/lib/libc/tests/regex/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/lib/libc/tests/regex/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -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: stable/10/lib/libc/tests/rpc/Makefile ============================================================================== --- stable/10/lib/libc/tests/rpc/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/lib/libc/tests/rpc/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -1,6 +1,5 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/lib/libc/rpc SRCS.xdr_test= ${RPCSRC:.x=_xdr.c} t_xdr.c ${RPCSRC:.x=.h} \ h_testbits.h Modified: stable/10/lib/libc/tests/setjmp/Makefile ============================================================================== --- stable/10/lib/libc/tests/setjmp/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/lib/libc/tests/setjmp/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -1,7 +1,5 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/lib/libc/setjmp - NETBSD_ATF_TESTS_C= setjmp_test NETBSD_ATF_TESTS_C+= threadjmp_test @@ -10,4 +8,6 @@ LDADD.threadjmp_test+= -lpthread WARNS?= 4 +.include "../Makefile.netbsd-tests" + .include <bsd.test.mk> Modified: stable/10/lib/libc/tests/ssp/Makefile ============================================================================== --- stable/10/lib/libc/tests/ssp/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/lib/libc/tests/ssp/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -2,8 +2,6 @@ .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/lib/libc/ssp - NO_WERROR= WARNS?= 2 Modified: stable/10/lib/libc/tests/stdio/Makefile ============================================================================== --- stable/10/lib/libc/tests/stdio/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/lib/libc/tests/stdio/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -2,8 +2,6 @@ .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/lib/libc/stdio - ATF_TESTS_C+= fdopen_test ATF_TESTS_C+= fmemopen2_test ATF_TESTS_C+= fopen2_test Modified: stable/10/lib/libc/tests/stdlib/Makefile ============================================================================== --- stable/10/lib/libc/tests/stdlib/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/lib/libc/tests/stdlib/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -10,8 +10,6 @@ ATF_TESTS_CXX+= cxa_thread_atexit_test ATF_TESTS_CXX+= cxa_thread_atexit_nothr_test .endif -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: stable/10/lib/libc/tests/string/Makefile ============================================================================== --- stable/10/lib/libc/tests/string/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/lib/libc/tests/string/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -5,8 +5,6 @@ ATF_TESTS_C+= strerror2_test ATF_TESTS_C+= wcscasecmp_test ATF_TESTS_C+= wcsnlen_test -TESTSDIR= ${TESTSBASE}/lib/libc/string - # TODO: popcount, stresep NETBSD_ATF_TESTS_C+= memchr_test Modified: stable/10/lib/libc/tests/sys/Makefile ============================================================================== --- stable/10/lib/libc/tests/sys/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/lib/libc/tests/sys/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -2,8 +2,6 @@ .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/lib/libc/sys - ATF_TESTS_C+= queue_test # TODO: clone, lwp_create, lwp_ctl, posix_fadvise, recvmmsg, Modified: stable/10/lib/libc/tests/termios/Makefile ============================================================================== --- stable/10/lib/libc/tests/termios/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/lib/libc/tests/termios/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -2,8 +2,6 @@ .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/lib/libc/termios - NETBSD_ATF_TESTS_C= tcsetpgrp_test .include "../Makefile.netbsd-tests" Modified: stable/10/lib/libc/tests/time/Makefile ============================================================================== --- stable/10/lib/libc/tests/time/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/lib/libc/tests/time/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -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: stable/10/lib/libc/tests/tls/Makefile ============================================================================== --- stable/10/lib/libc/tests/tls/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/lib/libc/tests/tls/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -2,7 +2,6 @@ .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/lib/libc/tls .if !defined(NO_PIC) SUBDIR+= dso .endif Modified: stable/10/lib/libc/tests/tls/dso/Makefile ============================================================================== --- stable/10/lib/libc/tests/tls/dso/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/lib/libc/tests/tls/dso/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -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: stable/10/lib/libc/tests/ttyio/Makefile ============================================================================== --- stable/10/lib/libc/tests/ttyio/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/lib/libc/tests/ttyio/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -2,8 +2,6 @@ .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/lib/libc/ttyio - # TODO: ptm_test NETBSD_ATF_TESTS_C= ttyio_test Modified: stable/10/lib/libcrypt/tests/Makefile ============================================================================== --- stable/10/lib/libcrypt/tests/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/lib/libcrypt/tests/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -4,8 +4,6 @@ SRCTOP= ${.CURDIR:H:H:H} OBJTOP= ${.OBJDIR:H:H:H} TESTSRC= ${SRCTOP}/contrib/netbsd-tests/lib/libcrypt -TESTSDIR= ${TESTSBASE}/lib/libcrypt - NETBSD_ATF_TESTS_C+= crypt_test CFLAGS+= -I${.CURDIR:H} Modified: stable/10/lib/libmp/tests/Makefile ============================================================================== --- stable/10/lib/libmp/tests/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/lib/libmp/tests/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -1,7 +1,5 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/lib/libmp - TAP_TESTS_C+= legacy_test DPADD+= ${LIBCRYPTO} ${LIBMP} Modified: stable/10/lib/libnv/tests/Makefile ============================================================================== --- stable/10/lib/libnv/tests/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/lib/libnv/tests/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -1,7 +1,5 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/lib/libnv - ATF_TESTS_CXX= \ dnv_tests \ nv_tests \ Modified: stable/10/lib/libpam/libpam/tests/Makefile ============================================================================== --- stable/10/lib/libpam/libpam/tests/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/lib/libpam/libpam/tests/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -1,6 +1,6 @@ # $FreeBSD$ -OPENPAM = ${.CURDIR}/../../../../contrib/openpam +OPENPAM= ${SRCTOP}/contrib/openpam .PATH: ${OPENPAM}/t TESTSDIR = ${TESTSBASE}/lib/libpam Modified: stable/10/lib/librt/tests/Makefile ============================================================================== --- stable/10/lib/librt/tests/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/lib/librt/tests/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -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 - DPADD+= ${LIBRT} LDADD+= -lrt Modified: stable/10/lib/libthr/tests/Makefile ============================================================================== --- stable/10/lib/libthr/tests/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/lib/libthr/tests/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -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: stable/10/lib/libthr/tests/dlopen/Makefile ============================================================================== --- stable/10/lib/libthr/tests/dlopen/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/lib/libthr/tests/dlopen/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -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: stable/10/lib/libthr/tests/dlopen/dso/Makefile ============================================================================== --- stable/10/lib/libthr/tests/dlopen/dso/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/lib/libthr/tests/dlopen/dso/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -1,7 +1,5 @@ # $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: stable/10/lib/libutil/tests/Makefile ============================================================================== --- stable/10/lib/libutil/tests/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/lib/libutil/tests/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -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: stable/10/lib/msun/tests/Makefile ============================================================================== --- stable/10/lib/msun/tests/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/lib/msun/tests/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -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: stable/10/lib/tests/Makefile ============================================================================== --- stable/10/lib/tests/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/lib/tests/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -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: stable/10/libexec/atf/atf-check/tests/Makefile ============================================================================== --- stable/10/libexec/atf/atf-check/tests/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/libexec/atf/atf-check/tests/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -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: stable/10/libexec/atf/atf-sh/tests/Makefile ============================================================================== --- stable/10/libexec/atf/atf-sh/tests/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/libexec/atf/atf-sh/tests/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -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: stable/10/libexec/atf/tests/Makefile ============================================================================== --- stable/10/libexec/atf/tests/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/libexec/atf/tests/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -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: stable/10/libexec/tests/Makefile ============================================================================== --- stable/10/libexec/tests/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/libexec/tests/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -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: stable/10/sbin/devd/tests/Makefile ============================================================================== --- stable/10/sbin/devd/tests/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/sbin/devd/tests/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -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: stable/10/sbin/dhclient/tests/Makefile ============================================================================== --- stable/10/sbin/dhclient/tests/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/sbin/dhclient/tests/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -1,7 +1,5 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/sbin/dhclient - .PATH: ${.CURDIR}/.. PLAIN_TESTS_C= option-domain-search_test Modified: stable/10/sbin/growfs/tests/Makefile ============================================================================== --- stable/10/sbin/growfs/tests/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/sbin/growfs/tests/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -1,7 +1,5 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/sbin/growfs - TAP_TESTS_PERL= legacy_test .include <bsd.test.mk> Modified: stable/10/sbin/mdconfig/tests/Makefile ============================================================================== --- stable/10/sbin/mdconfig/tests/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/sbin/mdconfig/tests/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -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: stable/10/sbin/tests/Makefile ============================================================================== --- stable/10/sbin/tests/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/sbin/tests/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -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: stable/10/secure/lib/tests/Makefile ============================================================================== --- stable/10/secure/lib/tests/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/secure/lib/tests/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -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: stable/10/secure/libexec/tests/Makefile ============================================================================== --- stable/10/secure/libexec/tests/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/secure/libexec/tests/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -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: stable/10/secure/tests/Makefile ============================================================================== --- stable/10/secure/tests/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/secure/tests/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -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: stable/10/secure/usr.bin/tests/Makefile ============================================================================== --- stable/10/secure/usr.bin/tests/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/secure/usr.bin/tests/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -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: stable/10/secure/usr.sbin/tests/Makefile ============================================================================== --- stable/10/secure/usr.sbin/tests/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/secure/usr.sbin/tests/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -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> Modified: stable/10/share/examples/tests/Makefile ============================================================================== --- stable/10/share/examples/tests/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/share/examples/tests/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -2,11 +2,9 @@ .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/share/examples - SUBDIR= tests +.PATH: ${SRCTOP}/tests KYUAFILE= yes -.PATH: ${.CURDIR:H:H:H}/tests .include <bsd.test.mk> Modified: stable/10/share/tests/Makefile ============================================================================== --- stable/10/share/tests/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/share/tests/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -4,7 +4,7 @@ TESTSDIR= ${TESTSBASE}/share -.PATH: ${.CURDIR:H:H}/tests +.PATH: ${SRCTOP}/tests KYUAFILE= yes .include <bsd.test.mk> Modified: stable/10/tests/etc/Makefile ============================================================================== --- stable/10/tests/etc/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/tests/etc/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -4,7 +4,7 @@ TESTSDIR= ${TESTSBASE}/etc -.PATH: ${.CURDIR:H} +.PATH: ${SRCTOP}/tests KYUAFILE= yes SUBDIR+= rc.d Modified: stable/10/tests/sys/mqueue/Makefile ============================================================================== --- stable/10/tests/sys/mqueue/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/tests/sys/mqueue/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -6,7 +6,7 @@ ATF_TESTS_SH= mqueue_test BINDIR= ${TESTSDIR} -CFLAGS+= -I${.CURDIR:H:H} +CFLAGS+= -I${SRCTOP}/tests PROGS+= mqtest1 PROGS+= mqtest2 Modified: stable/10/tests/sys/pjdfstest/tests/Makefile ============================================================================== --- stable/10/tests/sys/pjdfstest/tests/Makefile Thu Feb 9 22:14:17 2017 (r313487) +++ stable/10/tests/sys/pjdfstest/tests/Makefile Thu Feb 9 22:49:48 2017 (r313488) @@ -1,6 +1,6 @@ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702092249.v19MnmtK006121>