diff options
| author | Julio Merino <jmmv@FreeBSD.org> | 2013-12-28 23:08:58 +0000 |
|---|---|---|
| committer | Julio Merino <jmmv@FreeBSD.org> | 2013-12-28 23:08:58 +0000 |
| commit | feede201d401ea6ca79ed273e75c3880b218b9a1 (patch) | |
| tree | f67dde62985332519d0ad6763cdb1b68c9793ab3 /libexec | |
| parent | 027e2b3cecc0dd0690e7413c99e278d5a04507a5 (diff) | |
Notes
Diffstat (limited to 'libexec')
| -rw-r--r-- | libexec/Makefile | 2 | ||||
| -rw-r--r-- | libexec/atf/Makefile | 2 | ||||
| -rw-r--r-- | libexec/atf/Makefile.inc | 2 | ||||
| -rw-r--r-- | libexec/atf/atf-check/Makefile | 5 | ||||
| -rw-r--r-- | libexec/atf/atf-check/Makefile.inc | 3 | ||||
| -rw-r--r-- | libexec/atf/atf-check/tests/Makefile | 12 | ||||
| -rw-r--r-- | libexec/atf/tests/Makefile | 10 | ||||
| -rw-r--r-- | libexec/tests/Makefile | 10 |
8 files changed, 43 insertions, 3 deletions
diff --git a/libexec/Makefile b/libexec/Makefile index 576335f2d2fd..cf5c12016c04 100644 --- a/libexec/Makefile +++ b/libexec/Makefile @@ -28,6 +28,7 @@ SUBDIR= ${_atf} \ talkd \ tcpd \ ${_telnetd} \ + ${_tests} \ tftpd \ ${_tftp-proxy} \ ulog-helper \ @@ -74,6 +75,7 @@ _telnetd= telnetd .if ${MK_TESTS} != "no" _atf= atf +_tests= tests .endif .include <bsd.subdir.mk> diff --git a/libexec/atf/Makefile b/libexec/atf/Makefile index dc222c393329..6749db5fce9f 100644 --- a/libexec/atf/Makefile +++ b/libexec/atf/Makefile @@ -25,6 +25,6 @@ # # $FreeBSD$ -SUBDIR= atf-check +SUBDIR= atf-check tests .include <bsd.subdir.mk> diff --git a/libexec/atf/Makefile.inc b/libexec/atf/Makefile.inc index a28f54645572..392bbb23b236 100644 --- a/libexec/atf/Makefile.inc +++ b/libexec/atf/Makefile.inc @@ -25,8 +25,6 @@ # # $FreeBSD$ -ATF = ${.CURDIR}/../../../contrib/atf - CFLAGS+= -DHAVE_CONFIG_H WARNS?= 3 diff --git a/libexec/atf/atf-check/Makefile b/libexec/atf/atf-check/Makefile index fafb1e40d653..0cfa8636491b 100644 --- a/libexec/atf/atf-check/Makefile +++ b/libexec/atf/atf-check/Makefile @@ -27,6 +27,7 @@ .include <bsd.init.mk> +ATF= ${.CURDIR:H:H:H}/contrib/atf .PATH: ${ATF}/atf-sh BINDIR= /usr/libexec @@ -42,4 +43,8 @@ LDFLAGS+= -L${.OBJDIR}/../../../lib/atf/libatf-c++ LDFLAGS+= -L${.OBJDIR}/../../../lib/atf/libatf-c LDADD+= -latf-c++ -latf-c +.if ${MK_TESTS} != "no" +SUBDIR+= tests +.endif + .include <bsd.prog.mk> diff --git a/libexec/atf/atf-check/Makefile.inc b/libexec/atf/atf-check/Makefile.inc new file mode 100644 index 000000000000..265f86d1ed55 --- /dev/null +++ b/libexec/atf/atf-check/Makefile.inc @@ -0,0 +1,3 @@ +# $FreeBSD$ + +.include "../Makefile.inc" diff --git a/libexec/atf/atf-check/tests/Makefile b/libexec/atf/atf-check/tests/Makefile new file mode 100644 index 000000000000..0f237e6d3f78 --- /dev/null +++ b/libexec/atf/atf-check/tests/Makefile @@ -0,0 +1,12 @@ +# $FreeBSD$ + +.include <bsd.init.mk> + +TESTSDIR= ${TESTSBASE}/libexec/atf/atf-check + +ATF= ${.CURDIR:H:H:H:H}/contrib/atf +.PATH: ${ATF}/atf-sh + +ATF_TESTS_SH= atf-check_test + +.include <atf.test.mk> diff --git a/libexec/atf/tests/Makefile b/libexec/atf/tests/Makefile new file mode 100644 index 000000000000..7aa96019367e --- /dev/null +++ b/libexec/atf/tests/Makefile @@ -0,0 +1,10 @@ +# $FreeBSD$ + +.include <bsd.own.mk> + +TESTSDIR= ${TESTSBASE}/libexec/atf + +.PATH: ${.CURDIR:H:H:H}/tests +KYUAFILE= yes + +.include <bsd.test.mk> diff --git a/libexec/tests/Makefile b/libexec/tests/Makefile new file mode 100644 index 000000000000..665efab4275e --- /dev/null +++ b/libexec/tests/Makefile @@ -0,0 +1,10 @@ +# $FreeBSD$ + +.include <bsd.own.mk> + +TESTSDIR= ${TESTSBASE}/libexec + +.PATH: ${.CURDIR:H:H}/tests +KYUAFILE= yes + +.include <bsd.test.mk> |