aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSiva Mahadevan <me@svmhdvn.name>2025-07-21 13:25:26 +0000
committerWarner Losh <imp@FreeBSD.org>2025-09-05 18:42:22 +0000
commit74898ce961e1f4818eba500dfa3a06bc30c1d9b3 (patch)
tree4374cd31ccc2e025f8476fc9336eb827216d3e00
parent559b0f6b82867b60a2d5cb1b2744114603cb17a7 (diff)
tests/sndstat: use require.kmods property instead of ad-hoc checks
Signed-off-by: Siva Mahadevan <me@svmhdvn.name> Sponsored by: The FreeBSD Foundation Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1780
-rw-r--r--tests/sys/sound/sndstat.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/tests/sys/sound/sndstat.c b/tests/sys/sound/sndstat.c
index ed292b570429..bbf18aca2824 100644
--- a/tests/sys/sound/sndstat.c
+++ b/tests/sys/sound/sndstat.c
@@ -40,17 +40,11 @@
#include <stdlib.h>
#include <unistd.h>
-static void
-load_dummy(void)
-{
- if (kldload("snd_dummy.ko") < 0 && errno != EEXIST)
- atf_tc_skip("snd_dummy.ko not found");
-}
-
ATF_TC(sndstat_nv);
ATF_TC_HEAD(sndstat_nv, tc)
{
atf_tc_set_md_var(tc, "descr", "/dev/sndstat nvlist test");
+ atf_tc_set_md_var(tc, "require.kmods", "snd_dummy");
}
ATF_TC_BODY(sndstat_nv, tc)
@@ -62,8 +56,6 @@ ATF_TC_BODY(sndstat_nv, tc)
size_t nitems, nchans, i, j;
int fd, rc, pchan, rchan;
- load_dummy();
-
if ((fd = open("/dev/sndstat", O_RDONLY)) < 0)
atf_tc_skip("/dev/sndstat not found, load sound(4)");
@@ -223,6 +215,7 @@ ATF_TC(sndstat_udev);
ATF_TC_HEAD(sndstat_udev, tc)
{
atf_tc_set_md_var(tc, "descr", "/dev/sndstat userdev interface test");
+ atf_tc_set_md_var(tc, "require.kmods", "snd_dummy");
}
ATF_TC_BODY(sndstat_udev, tc)
@@ -234,8 +227,6 @@ ATF_TC_BODY(sndstat_udev, tc)
size_t nitems, i;
int fd, rc, pchan, rchan, n;
- load_dummy();
-
if ((fd = open("/dev/sndstat", O_RDWR)) < 0)
atf_tc_skip("/dev/sndstat not found, load sound(4)");