git: 3bd7deffdda7 - stable/15 - mixer/tests: use require.kmods property instead of ad-hoc checks
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 17 Feb 2026 12:52:01 UTC
The branch stable/15 has been updated by christos:
URL: https://cgit.FreeBSD.org/src/commit/?id=3bd7deffdda7f9778254f4670e138e4cbac6eb2d
commit 3bd7deffdda7f9778254f4670e138e4cbac6eb2d
Author: Siva Mahadevan <siva@FreeBSD.org>
AuthorDate: 2026-02-11 21:50:00 +0000
Commit: Christos Margiolis <christos@FreeBSD.org>
CommitDate: 2026-02-17 12:51:28 +0000
mixer/tests: use require.kmods property instead of ad-hoc checks
Reviewed by: christos
Approved by: lwhsu (mentor)
Sponsored by: The FreeBSD Foundation
MFC after: 3 days
Differential Revision: https://reviews.freebsd.org/D55221
(cherry picked from commit 5fa297f4bcd277dca7eef03e68363fb1e721799e)
---
usr.sbin/mixer/tests/Makefile | 3 ++-
usr.sbin/mixer/tests/mixer_test.sh | 12 ------------
2 files changed, 2 insertions(+), 13 deletions(-)
diff --git a/usr.sbin/mixer/tests/Makefile b/usr.sbin/mixer/tests/Makefile
index c8056169f9a4..a39a66cc8277 100644
--- a/usr.sbin/mixer/tests/Makefile
+++ b/usr.sbin/mixer/tests/Makefile
@@ -1,6 +1,7 @@
ATF_TESTS_SH+= mixer_test
# mixer tests fiddle with a singleton dummy audio device.
-TEST_METADATA.mixer_test= is_exclusive=true
+TEST_METADATA.mixer_test= is_exclusive=true \
+ required_kmods="snd_dummy"
.include <bsd.test.mk>
diff --git a/usr.sbin/mixer/tests/mixer_test.sh b/usr.sbin/mixer/tests/mixer_test.sh
index 45003251c460..c48512db5ec7 100755
--- a/usr.sbin/mixer/tests/mixer_test.sh
+++ b/usr.sbin/mixer/tests/mixer_test.sh
@@ -45,13 +45,6 @@ restore_conf()
test -r "test_mixer_conf" && mixer $(cat test_mixer_conf)
}
-load_dummy()
-{
- if ! kldload -n snd_dummy; then
- atf_skip "cannot load snd_dummy.ko"
- fi
-}
-
set_default()
{
deflt_unit="$(mixer | grep ^pcm | cut -f1 -d:)"
@@ -78,7 +71,6 @@ o_flag_head()
}
o_flag_body()
{
- load_dummy
mixer_exists
set_default
@@ -96,7 +88,6 @@ d_flag_head()
}
d_flag_body()
{
- load_dummy
mixer_exists
set_default
@@ -118,7 +109,6 @@ volume_head()
}
volume_body()
{
- load_dummy
mixer_exists
set_default
save_conf
@@ -204,7 +194,6 @@ mute_head()
}
mute_body()
{
- load_dummy
mixer_exists
set_default
save_conf
@@ -248,7 +237,6 @@ recsrc_head()
}
recsrc_body()
{
- load_dummy
mixer_exists
set_default
save_conf