diff options
| author | Enji Cooper <ngie@FreeBSD.org> | 2015-10-12 08:16:03 +0000 |
|---|---|---|
| committer | Enji Cooper <ngie@FreeBSD.org> | 2015-10-12 08:16:03 +0000 |
| commit | b2d48be1bc7df45ddd13b143a160d0acb5a383c5 (patch) | |
| tree | 67a85c5694bcdbbc7b1839be795cd25ef318ed91 /usr.sbin | |
| parent | 4f4a7a03cea15a671284f9c06ada80755c994df6 (diff) | |
Notes
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/etcupdate/tests/Makefile | 2 | ||||
| -rw-r--r-- | usr.sbin/fstyp/tests/Makefile | 2 | ||||
| -rw-r--r-- | usr.sbin/newsyslog/tests/Makefile | 2 | ||||
| -rw-r--r-- | usr.sbin/nmtree/tests/Makefile | 4 | ||||
| -rw-r--r-- | usr.sbin/pw/tests/Makefile | 2 | ||||
| -rw-r--r-- | usr.sbin/sa/tests/Makefile | 2 | ||||
| -rw-r--r-- | usr.sbin/tests/Makefile | 4 |
7 files changed, 2 insertions, 16 deletions
diff --git a/usr.sbin/etcupdate/tests/Makefile b/usr.sbin/etcupdate/tests/Makefile index da83397e61ff..45b12b7bb75d 100644 --- a/usr.sbin/etcupdate/tests/Makefile +++ b/usr.sbin/etcupdate/tests/Makefile @@ -1,7 +1,5 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.sbin/etcupdate - PLAIN_TESTS_SH= .for test in always_test \ conflicts_test \ diff --git a/usr.sbin/fstyp/tests/Makefile b/usr.sbin/fstyp/tests/Makefile index db686b59c314..01c98699e2a0 100644 --- a/usr.sbin/fstyp/tests/Makefile +++ b/usr.sbin/fstyp/tests/Makefile @@ -1,7 +1,5 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.sbin/fstyp - ATF_TESTS_SH= fstyp_test FILES= ext2.img.bz2 diff --git a/usr.sbin/newsyslog/tests/Makefile b/usr.sbin/newsyslog/tests/Makefile index f8ad2739cd78..802a44c01012 100644 --- a/usr.sbin/newsyslog/tests/Makefile +++ b/usr.sbin/newsyslog/tests/Makefile @@ -1,7 +1,5 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.sbin/newsyslog - TAP_TESTS_SH= legacy_test .include <bsd.test.mk> diff --git a/usr.sbin/nmtree/tests/Makefile b/usr.sbin/nmtree/tests/Makefile index 1df81d0f0a44..0b6312723162 100644 --- a/usr.sbin/nmtree/tests/Makefile +++ b/usr.sbin/nmtree/tests/Makefile @@ -1,10 +1,8 @@ # $FreeBSD$ -TESTSRC= ${.CURDIR}/../../../contrib/netbsd-tests/usr.sbin/mtree +TESTSRC= ${SRCTOP}/contrib/netbsd-tests/usr.sbin/mtree .PATH: ${TESTSRC} -TESTSDIR= ${TESTSBASE}/usr.sbin/nmtree - ATF_TESTS_SH= nmtree_test ATF_TESTS_SH_SRC_nmtree_test= t_mtree.sh diff --git a/usr.sbin/pw/tests/Makefile b/usr.sbin/pw/tests/Makefile index a1605aadaf57..27f0ac44eca0 100644 --- a/usr.sbin/pw/tests/Makefile +++ b/usr.sbin/pw/tests/Makefile @@ -1,7 +1,5 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.sbin/pw - ATF_TESTS_SH= pw_etcdir \ pw_lock \ pw_config \ diff --git a/usr.sbin/sa/tests/Makefile b/usr.sbin/sa/tests/Makefile index 204b51094515..3c74ba97d673 100644 --- a/usr.sbin/sa/tests/Makefile +++ b/usr.sbin/sa/tests/Makefile @@ -1,7 +1,5 @@ # $FreeBSD$ -TESTSDIR= ${TESTSBASE}/usr.sbin/sa - TAP_TESTS_SH= legacy_test FILESDIR= ${TESTSDIR} diff --git a/usr.sbin/tests/Makefile b/usr.sbin/tests/Makefile index a7e9c7140f70..a0e63e5da42a 100644 --- a/usr.sbin/tests/Makefile +++ b/usr.sbin/tests/Makefile @@ -2,9 +2,7 @@ .include <bsd.own.mk> -TESTSDIR= ${TESTSBASE}/usr.sbin - -.PATH: ${.CURDIR:H:H}/tests +.PATH: ${SRCTOP}/tests KYUAFILE= yes .include <bsd.test.mk> |