From nobody Thu Feb 12 15:03:06 2026 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4fBdpM00CHz6RmpN for ; Thu, 12 Feb 2026 15:03:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fBdpL3sVSz40WS for ; Thu, 12 Feb 2026 15:03:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770908586; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YXI1CqOpE7GdeRd6R4Pv+itHk8ELZKvoqfu2sUb8Erc=; b=a126qJCHEvO94+x6UMqBqcGWZr99phdzzRj7ic2ahDBhpyMnd65c/P8agRJFIh+E7WSMP5 HtEH3QogWvYci65YJRfQyGGfU/ryN0ANMRCVe5qorjDhZ42+Vz4ImJyJU2ODFyHXhE5PAZ 0/rF4gCC8HuqiSyawYDAA/d/uwsFozjUQCw5VCk28mcqVbtwzT5mzXKiZ3bYXerw17nmcL 2qoDXlW8XqizMaqepaYSY1jA6P1jlqMwaP0np13FVC8/UMQ3punzaDyxSXgNs9h/i2+ThH U4eE68pe3xHSSAIds54k5iGIjdVEX0Lz4V2xUtXT+ED27sEafg6m4umIFesi+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770908586; a=rsa-sha256; cv=none; b=RPghcxLtLXYHIT6fMFzlV2jV4Rh7QTDMSWuIr78JnC1pKUYWVYw++TM7hmvMgDV0R52yqy DNQMvdwk2JZKwFIi2EyKwQJNZ4Lci8lxG28fBCUHWcNVSdrXJQtJswvo0Csaj/GAfgOMOu PVxQMSGte4YNh1qsFlt+VViGlu76f32X7IhSTY/Z5cOPNr/0Lyq9/UEJj/OOH6Z376tDSY TEVDUZnqkiFpDdguXqiSSK7u6+tlrHBf2EKB19WzJKYetffdNqvzTqGHcLcNAuXXWT3n6Y 5h2LwAtW+QvHesCMLw5JNj2r3ysvN7Mj1GoMLPWUK5BRuyoCTxtQD6M0EQrYfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770908586; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YXI1CqOpE7GdeRd6R4Pv+itHk8ELZKvoqfu2sUb8Erc=; b=AC0fdZxhh2rCUNuDoN4xmdeBATiofMI3KRKPbLVa/3IZCHTI0fzIfXG+ztxaEAfOW1qbtQ i/cR24TVx29DKWPAFh0/DmQ0MaIN9c12sWCIQKWfLhHoh/5WgxF+lKLjpCqVfJQ6kFBQYj N8rX7ZS1NLJRSVxxrHKAqHG8rmeHXCN8Bx65acZ5WnGpA14OAncexzbhd/5ioqTI48wHJp VmyOwK3Miz08UOwmhDB7KcHsBUn/6RQK8TK+qJoAzLkTm3sfMJEFf3R+yDOi9j+Wwp23IY HFL0CAK+ZgFkzm/e5OtQV8xo9dQdqUDvay8Bv7hpMtrZavHSl78cSwDqiMCGew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fBdpL2HQYzh63 for ; Thu, 12 Feb 2026 15:03:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 196ff by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 12 Feb 2026 15:03:06 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Siva Mahadevan Subject: git: 5fa297f4bcd2 - main - mixer/tests: use require.kmods property instead of ad-hoc checks List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: siva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5fa297f4bcd277dca7eef03e68363fb1e721799e Auto-Submitted: auto-generated Date: Thu, 12 Feb 2026 15:03:06 +0000 Message-Id: <698debaa.196ff.62c62bc0@gitrepo.freebsd.org> The branch main has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=5fa297f4bcd277dca7eef03e68363fb1e721799e commit 5fa297f4bcd277dca7eef03e68363fb1e721799e Author: Siva Mahadevan AuthorDate: 2026-02-11 21:50:00 +0000 Commit: Siva Mahadevan CommitDate: 2026-02-12 15:01:57 +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 --- 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 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