newfs_msdos: connect the ATF test from NetBSD

NetBSD has an ATF test for newfs_msdos.  Connect it to the build.
Adapt it for FreeBSD.  This would have caught the bug fixed by my
previous commit.

Reviewed by:	delphij, emaste
MFC after:	1 week
Sponsored by:	Dell EMC Isilon
Differential Revision:	https://reviews.freebsd.org/D34116
This commit is contained in:
Eric van Gyzen 2022-01-31 14:43:04 -06:00
parent 9990450e17
commit 4e71258227
4 changed files with 25 additions and 2 deletions

View File

@ -31,11 +31,21 @@ validfat32_head() {
}
validfat32_body() {
atf_check -s eq:0 -o ignore -e ignore \
if true; then
# FreeBSD
exp_err=empty
fsck=fsck_msdosfs
else
# NetBSD
exp_err=ignore
fsck=fsck_msdos
fi
atf_check -s eq:0 -o ignore -e $exp_err \
newfs_msdos -b 512 -C 33m -F 32 msdos.img
# fsck_msdos/newfs_msdos have been fixed
# atf_expect_fail "PR bin/46743"
atf_check -s eq:0 -o not-match:FIXED -e empty fsck_msdos -p msdos.img
atf_check -s eq:0 -o not-match:FIXED -e empty $fsck -p msdos.img
atf_expect_pass
}

View File

@ -442,6 +442,8 @@
..
mdconfig
..
newfs_msdos
..
nvmecontrol
..
pfctl

View File

@ -1,5 +1,7 @@
# $FreeBSD$
.include <src.opts.mk>
PACKAGE=runtime
PROG= newfs_msdos
MAN= newfs_msdos.8
@ -11,4 +13,7 @@ WARNS?= 3
.endif
CSTD= c11
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
.include <bsd.prog.mk>

View File

@ -0,0 +1,6 @@
TESTSRC=${SRCTOP}/contrib/netbsd-tests/sbin/newfs_msdos
NETBSD_ATF_TESTS_SH+= create
.include <netbsd-tests.test.mk>
.include <bsd.test.mk>