New version. A summary of changes since the last one, pulled from git, is shown below:

• tests: pf: Typo.
• tests: pf: Added address prefix variables in all tests.
• tests: pf: Fixed scrub_forward by changing implementation.
• tests: pf: Renamed test scrub_forward to scrub.
• tests: pf: Updated documentation of pf_test_scrub.sh.
• tests: pf: Changed idea in "Future work" section of README.
• tests: pf: Reduced boilerplate code.
• tests: pf: Reduced boilerplate code, IPv6 functions.
• tests: pf: Changed test names.
• tests: pf: Improved network interface creation code.
• tests: pf: Function calling examples.
• tests: pf: Added init_test function.

New version. A summary of changes since the last one, pulled from git, is shown below:

I had already changed the coding style, mostly regarding error checking,
to use if blocks when suitable. I didn't change the indentation
however, as it needed some rethinking regarding error checking and
cleanup code. I will change it to use tabs as soon as possible.

I've made a change which I'm testing currently, running pkg with the -r
flag instead of chrooting. Will commit if it works.

New version. A summary of changes since the last one, pulled from git, is shown below:

• Fix mtree and makefiles.
• Split tests into separate files.
• Some documentation.
• Improve error handling and reporting.
• Some style fixing.

More work.

Work on make_baseimg.sh.

More work.

New version.

Reverted to previous version (last update was a mistake).

New version.

Added workaround so that the test files get installed correctly.

In D11322#239521, @kristof wrote:

I think you're also missing the connection in the pfctl makefile. I've been looking at sbin/mdconfig as an example and it has this:

.if ${MK_TESTS} != "no"
SUBDIR+=    tests
.endif

In D11322#234898, @kristof wrote:

It might also be worth seeing if you can add a couple of tests for ALTQ.
That's also interesting to consider because ALTQ is an optional feature and might not be available in the running kernel.
That'd mean you'd have to have test metadata to figure out if you can sensibly run the test on this system or not (presumably kyua understands the concept of a skipped test).

Fixed various issues.

Removed hardcoded binary path. Also moved tests under src/sbin/pfctl/tests.

Use pfctl from PATH, instead of custom location.

Added tests/sbin/Kyuafile. 'make install' as root still fails because of missing directories under '/usr/tests'.

Uploaded correct diff.

Cleaned-up version, with improved test descriptions.

Only the diff pertaining to kernel pf tests is now included.

Will do!

Den 2017-06-28 kl. 20:14, skrev kristof (Kristof Provost):

kristof added a comment.

It'd also be good to include the changes required to hook up the sbin/pfctl/Kyuafile to the tests Kyuafile.
Your GitHub repo has a symlink to get recursive behaviour out of Kyua, but there's basically no other symlinks in the repo, so let's avoid that. I'd add a simple include Kyuafile, like ./contrib/atf/Kyuafile does.

Done! I've changed the Kyuafiles now, and started using Makefiles
extensively. This also means that tests can be installed to /usr/tests
and run from there, or run from the source directory.

INLINE COMMENTS

pfctl_test.sh:32
+ atf_test_case "pf${i}"
+ eval "pf${i}_head () { atf_set descr $(pf${i}_descr) ; }"
+ eval "pf${i}_body () { \

Wouldn't this allow descriptions with spaces (and optionally multiline):

eval "pf${if}_head() { atf_set descr \"$(pf${i}_descr)\" ; }"

I also wonder if it wouldn't be better to put the description in a per-test file. pf1004.descr for example.

That is true, it was mostly a quick solution. I did the change above
and it works now.

test_altq.c:3
+
+#include <sys/types.h>
+#include <net/if.h>

This file isn't used yet, right? I'd leave that out of this, and add it in a subsequent patch.

I have removed it now.

Added a small utility that checks for ALTQ support in the kernel. Also improved integration with the build system.

tests/sbin/pfctl: improved test descriptions

tests/sbin/pfctl: removed empty tests