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 /etc | |
| 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 'etc')
| -rw-r--r-- | etc/Makefile | 2 | ||||
| -rw-r--r-- | etc/mtree/BSD.include.dist | 4 | ||||
| -rw-r--r-- | etc/mtree/BSD.tests.dist | 40 | ||||
| -rw-r--r-- | etc/mtree/BSD.usr.dist | 6 |
4 files changed, 39 insertions, 13 deletions
diff --git a/etc/Makefile b/etc/Makefile index d763df6..70a1e2a 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -321,7 +321,7 @@ MTREES+= mtree/BSD.debug.dist /usr/lib MTREES+= mtree/BSD.groff.dist /usr .endif .if ${MK_TESTS} != "no" -MTREES+= mtree/BSD.tests.dist ${TESTSBASE} +MTREES+= mtree/BSD.tests.dist /usr .endif .if ${MK_SENDMAIL} != "no" MTREES+= mtree/BSD.sendmail.dist / diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist index 76cdf94..160e9d9 100644 --- a/etc/mtree/BSD.include.dist +++ b/etc/mtree/BSD.include.dist @@ -9,10 +9,6 @@ .. arpa .. - atf-c - .. - atf-c++ - .. bsm .. bsnmp diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 37f37e9..85a0811 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -5,8 +5,44 @@ /set type=dir uname=root gname=wheel mode=0755 . - lib - libcrypt + include + atf-c + .. + atf-c++ + .. + .. + share + atf + .. + doc + atf + .. + .. + .. + tests + lib + atf + libatf-c + .. + libatf-c++ + .. + test-programs + .. + .. + libcrypt + .. + .. + libexec + atf + atf-check + .. + .. + .. + usr.bin + atf + atf-sh + .. + .. .. .. .. diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index bb50c5e..e7e6f99 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -120,8 +120,6 @@ sbin .. share - atf - .. bsdconfig media .. @@ -165,8 +163,6 @@ doc IPv6 .. - atf - .. atm .. legal @@ -1447,6 +1443,4 @@ .. src nochange .. - tests - .. .. |
