diff options
| author | ngie <ngie@FreeBSD.org> | 2014-12-30 02:32:48 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2014-12-30 02:32:48 +0000 |
| commit | 6d931c08fa2abce728837379fb2549a6513f49b0 (patch) | |
| tree | 296af32f8435c92fe88e114d49f3007c65dedff1 /etc | |
| parent | 3b591af2d9206cc8238757dc71fb88cbc8126e54 (diff) | |
| download | FreeBSD-src-6d931c08fa2abce728837379fb2549a6513f49b0.zip FreeBSD-src-6d931c08fa2abce728837379fb2549a6513f49b0.tar.gz | |
MFC r266074,r266104,r266147:
r266074:
Move old fmake tests into bmake and hook them to the build.
This first step is mostly to prevent the code from rotting even further
and to ensure these do not get wiped when fmake's code is removed from
the tree.
These tests are currently being skipped because they detect the underlying
make is not fmake and thus disable themselves -- and the reason is that
some of the tests fail, possibly due to legitimate bugs. Enabling them to
run against bmake will come separately.
Lastly, it would be ideal if these tests were fed upstream but they are
not ready for that yet. In the interim, just put them under usr.bin/bmake/
while we sort things out. The existence of a different unit-tests directory
within here makes me feel less guilty about this.
Change confirmed working with a clean amd64 build.
r266104:
Undo changes to the generated Makefile. Move tests directory to proper
location, including updating the test to work in the more-fragile
fmake -> bmake bootstrap environment.
r266147:
Makefile.inc is also included by the tests subdirectory, which results
in SUBDIRS having tests added to it, which fails. Work around this by
checking to make sure tests exists before adding it to subdirs and
work to get the generated file fixed so we can rename Makefile.inc to
something else so it isn't automatically included by subdirs...
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/mtree/BSD.tests.dist | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 3861f3d..7bdce04 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -169,21 +169,7 @@ usr.bin apply .. - calendar - .. - comm - .. - file2c - .. - join - .. - jot - .. - lastcomm - .. - m4 - .. - make + bmake archives fmt_44bsd .. @@ -281,6 +267,20 @@ .. .. .. + calendar + .. + comm + .. + file2c + .. + join + .. + jot + .. + lastcomm + .. + m4 + .. ncal .. printf |
