diff options
| author | jmmv <jmmv@FreeBSD.org> | 2013-12-28 23:08:58 +0000 |
|---|---|---|
| committer | jmmv <jmmv@FreeBSD.org> | 2013-12-28 23:08:58 +0000 |
| commit | 17b80845b0ba13495186831d3505af8c20eeb6ac (patch) | |
| tree | f67dde62985332519d0ad6763cdb1b68c9793ab3 /Makefile.inc1 | |
| parent | b8ce141a401c502407ab3e076ccfc3b428c8ac61 (diff) | |
| download | FreeBSD-src-17b80845b0ba13495186831d3505af8c20eeb6ac.zip FreeBSD-src-17b80845b0ba13495186831d3505af8c20eeb6ac.tar.gz | |
Plug the ATF tests into the build.
This is a MFC into stable/10 of:
- r257849 Add libatf-c++ to the prebuild libs.
- r257853 Build and install the atf tests.
- r258233 Move all atf directories to the tests mtree.
- r258285 Fix the build of some ATF tests.
This change is "make tinderbox" clean on ref10-amd64 with the default
settings of WITHOUT_TESTS. It is likely for the WITH_TESTS build to
still be broken because not all relevant changes have been merged yet.
Diffstat (limited to 'Makefile.inc1')
| -rw-r--r-- | Makefile.inc1 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index 13c676a..05eb661 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -494,7 +494,7 @@ _worldtmp: .endif .if ${MK_TESTS} != "no" mtree -deU -f ${.CURDIR}/etc/mtree/BSD.tests.dist \ - -p ${WORLDTMP}${TESTSBASE} >/dev/null + -p ${WORLDTMP}/usr >/dev/null .endif .for _mtree in ${LOCAL_MTREE} mtree -deU -f ${.CURDIR}/${_mtree} -p ${WORLDTMP} > /dev/null @@ -1480,7 +1480,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} \ ${_kerberos5_lib_libhx509} ${_kerberos5_lib_libkrb5} \ ${_kerberos5_lib_libroken} \ ${_kerberos5_lib_libwind} \ - ${_lib_atf_libatf_c} \ + ${_lib_atf} \ lib/libbz2 ${_libcom_err} lib/libcrypt \ lib/libelf lib/libexpat \ ${_lib_libgssapi} ${_lib_libipx} \ @@ -1495,7 +1495,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} \ ${_secure_lib_libssh} ${_secure_lib_libssl} .if ${MK_TESTS} != "no" -_lib_atf_libatf_c= lib/atf/libatf-c +_lib_atf= lib/atf .endif .if ${MK_LIBTHR} != "no" |
