mirror of
https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git
synced 2024-11-14 06:12:01 +01:00
517e52b6c2
Upstream one-true-awk has two sets of tests. These are in addition to NetBSD's tests we're using. The 'bugs-fixed' tests from upstream are ready to use as-is (more or less). However, the 'tests' from upstream are not, so for now we'll just use the netbsd and bugs-fixed tests. They provide an OK workout and are better than nothing, though the tests themselves are for specific esoteric things. The upstream bugs-fixed tests are *ALMOST* a drop in. However, 3 test for errors and the upstream test jig mashes stdout and stderr together, which atf doesn't do, so make a tiny tweak to the upstream tests that I hope to upstream. Plus upstream has ../a.out: instead of awk: in the output. Not sure how to deal with this yet, so I've not proposed anything upstream and have changed the test locally. In addition, the system-status.awk test is not suitable to run in ATF. It wants to force sh to dump core, but kyua doesn't seem to allow that sometimes so the test will fail or pass based on whether or not a core dump can be created. Since it's unstable, remove it. This required moving the netbsd tests to a new direcotry, so update mtree files as well. The change is useless for 'make check' without it. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D31376 |
||
|---|---|---|
| .. | ||
| BSD.debug.dist | ||
| BSD.include.dist | ||
| BSD.lib32.dist | ||
| BSD.libsoft.dist | ||
| BSD.release.dist | ||
| BSD.root.dist | ||
| BSD.sendmail.dist | ||
| BSD.tests.dist | ||
| BSD.usr.dist | ||
| BSD.var.dist | ||
| Makefile | ||
| README | ||
$FreeBSD$
Note: If you modify these files, please keep hier(7) updated!
These files are used to create empty file hierarchies for building the
system into. Some notes about working with them are placed here to try
and keep them in good working order.
a) The files use 4 space indentation, and other than in the header
comments, should not contain any tabs. An indentation of 4 is
preferable to the standard indentation of 8 because the indentation
of levels in these files can become quite deep causing the line to
overflow 80 characters.
This also matches with the files generated when using the
mtree -c option, which was implemented that way for the same reason.
b) Only directories should be listed here.
c) The listing should be kept in filename sorted order.
d) Sanity checking changes to these files can be done by following
this procedure (the sed -e is ugly, but fixing mtree -c to
not emit the trailing white space would be even uglier):
mkdir /tmp/MTREE
mtree -deU -f BSD.X.dist -p /tmp/MTREE
mtree -cdin -k uname,gname,mode -p /tmp/MTREE | \
sed -e 's/ *$//' >BSD.X.new
diff -u BSD.X.dist BSD.X.new
rm -r /tmp/MTREE
Note that you will get some differences about /set lines,
and uname= gname= on certain directory areas, mainly man page
sections. This is caused by mtree not having a look ahead
mechanism for making better selections for these as it
traverses the hierarchy.
The BSD.X.new file should NOT be committed, as it will be missing
the correct header, and important keywords like ``nochange''.
Simply use the diff for a sanity check to make sure things are in
the correct order and correctly indented.
e) Further sanity checking of the system builds with DESTDIR=/someplace
are more complicated, but can often catch missing entries in these
files. I tend to run this more complete sanity check shortly after
the target date for a new release is announced.
If you want details on it bug me about it via email to
rgrimes@FreeBSD.org.