From nobody Fri Jun 26 16:59:37 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 4gn22x5Qvtz6jms2 for ; Fri, 26 Jun 2026 16:59:37 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gn22x46PWz4DKZ for ; Fri, 26 Jun 2026 16:59:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782493177; 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=qEFZWvJIUELPWn8PmzH/Jm/rZwQlgabkVET9KGReKOI=; b=gUwNNTVV+leX2zLRCsCKhcFZkj/GW3uCmhfprdDhcHnR46ulW7pHWRjCUaTWqIEvIjgJgF TSp4j5htFRC37fP5Gx2puSnfUSGvFkk/Qidu/MuRkwx5y3JM1MHAfqADkqrIuYOYLgS6ra 29S45i/ZtFOHEKqTJBtUwDTeKqIja6B4VFFGvkI37sYwwU2qJkI9aOBe2+K3QZfCsyvDPC Ckn9t4kq3DFkP2yqE11oBvtrnNSgup/EKpeLic5MLr8tgFfRu15kl9FUv5mvp1jBkaUw7b 6XtQkFCREFY7rhPHNUFL/Hezriyyc31NU8QlnKX2S1owYmHC/eyrfCANsQyKaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782493177; a=rsa-sha256; cv=none; b=K3CJK1zveLCKePI4M5EjS+wwTOjMSpp42GZ/aycbG33/cgNB0SJXl1NQfVX+PaqAqmEcHE 1fgK/LWH4FznGiycMvhTSibg1BC+BV4d2Kny3pli8Dbs7UMiaP0s29I6EaINTaD6+5OXJ+ 3G60GzwWaT+5qJZuRYy30fRtpUglLgGmkz2leZbc/J9QrH3LkZSO2szahb/4Bez7sQHGqk 1OuRTSZPk2xYVORKuY3YLDv6KC83COhrXZ0ZM3m+sBeF4Dut0aVflJlK1lPGBFzxQc490J iVMDt/BUDKbbCCnFWADuw/totBvaX3yKD3IKmu/3jGRX9Nh/ilxugDzHqP2PLA== 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=1782493177; 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=qEFZWvJIUELPWn8PmzH/Jm/rZwQlgabkVET9KGReKOI=; b=VRVor/85W051HpV9fE6fji6I92wC54jvNKUSuot6RVvq3urlDLkveLaYmaz60ynhZ/RFLK ktIXjiSILcwBEIDeGjnTEmbUv0xp4fRKeiaVcIHKqIky6i6YE63Ci3PuYPxeBXxHKTK44f neXF/aIvLNbFZWP/Z69d2adHDah9OhMOG7LFgJZsHfg/YmOiPveKC+p9xMPL7k1LedDK/n YuNzXAet3oC7o7nzUlpNT9LYuNrME1aM2pKg+0pl1qaZoOscP+hw5YvRVN8YrlhxLMgd8W 2uhHTctd1Ri4kwZprO4qzaq95RUG5kz2THzYajI0QYtmRNtOUCUHUmvKonYhyw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn22x2BLXzm9F for ; Fri, 26 Jun 2026 16:59:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 34772 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 16:59:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Siva Mahadevan Subject: git: ef7724764a1d - stable/14 - 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list 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/stable/14 X-Git-Reftype: branch X-Git-Commit: ef7724764a1da3d7615528f1ec4a13ff315562d2 Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 16:59:37 +0000 Message-Id: <6a3eaff9.34772.1fd89d8d@gitrepo.freebsd.org> The branch stable/14 has been updated by siva: URL: https://cgit.FreeBSD.org/src/commit/?id=ef7724764a1da3d7615528f1ec4a13ff315562d2 commit ef7724764a1da3d7615528f1ec4a13ff315562d2 Author: Siva Mahadevan AuthorDate: 2026-02-11 21:50:00 +0000 Commit: Siva Mahadevan CommitDate: 2026-06-26 15:46:32 +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 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