From nobody Tue Feb 17 12:52:01 2026 X-Original-To: dev-commits-src-branches@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 4fFffp4chJz6SNC0 for ; Tue, 17 Feb 2026 12:52:02 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fFffn747Hz3h5s for ; Tue, 17 Feb 2026 12:52:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1771332722; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fx8mGZEVgkPxJCLSTjceuVbFeYEbQ5P79eDC6yGT7Eg=; b=qTwEo8z0vurybwXkZljNnePiq0zaHlzhfTzB/mHt4IJFdGYq4dnDMR6R1BYdi1wJqEdBvD 6+UCaQL5/luNAcmBunVQLFFdlbyfqqOqeIdP9AcaVJZdelU95bxLPToSWwFyPfpOlWeHJM N5nAwnssSWbwEd3TvRNs8WLaovm1ShjIbnx/5B/xgGY1BxNcHi+dL5Pt0iMXwfrzi8l7Tq clZeyNNPwh6NaHPeY+gyPWE9cXVRoIP97UqAXJvkre1PO0zUrj6B84shHXzb5hNWF8R2o/ +FVM6+kPEdR5+IDEDM4fDgXiKjrJm8f26QxVIcfK160igNZdmdG+QGAR1ZdAXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1771332722; a=rsa-sha256; cv=none; b=wkWay+TKU/xb+myNQDBtRo5GakwbWcJzix8rKnLF/5m6gVVCN0MwD+REM/AaavWx139y/v gb+bobhKe99DLx/3GdtwUiPHPSL2aZ6WMXYSxQDZh2y9BJ2WGY2Ef4opOcLi1VRRgGBqkU cprgmJPublFaa8e4JD7yPdyCF6KSar9CGSBJfCAXGg5J+WlVMOvGh+vfxFd0I5boVnYWw5 6NsGuBDcT7aCY3sd4AKels9o/pTCDfo33VxG+aUFFJJhm7ND8sen8iC3vVBgPNhcDInQyf /dr/nOc3NuL7KNl+fbHujUDFS3euVctdJvvT85pqV6YXU1aYnX9dGdWG9MR0sQ== 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=1771332722; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fx8mGZEVgkPxJCLSTjceuVbFeYEbQ5P79eDC6yGT7Eg=; b=Uy+YlBUSjvIQIuHQ8Cg6PepXNRAxMvVx1/8Ki9VFlTMOqZtbxhBfllIiqMkVkQUfi3sxa1 NsVq0IKSTprCWWWkvLSvYp/2yIlIuIzRbWF3OkaLkSdpqDHdPULcYDt/zXane3BbQbsMvW vFv1SkiBxDxi1GCtopgI+PZ868ylv2OxtD5GF/sFk0B1c77vRsSTJQP5N9Wav+DtDjhICA nonbM/Gy2O4DSg3LvU7Opg+yiqyTUV2GcNCyYXqX+f7Sciu2DnMoR0U7S18z1pUcC5tYGE H3JMsj3LELo8+DSkTyIMR0F6qi2JjpQSD6XIjqnR18hhY9pWPMm2QfwuLSxXfA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fFffn6Ny6z19Dj for ; Tue, 17 Feb 2026 12:52:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3b66a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 17 Feb 2026 12:52:01 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Siva Mahadevan From: Christos Margiolis Subject: git: 3bd7deffdda7 - stable/15 - mixer/tests: use require.kmods property instead of ad-hoc checks List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 3bd7deffdda7f9778254f4670e138e4cbac6eb2d Auto-Submitted: auto-generated Date: Tue, 17 Feb 2026 12:52:01 +0000 Message-Id: <69946471.3b66a.51e457ec@gitrepo.freebsd.org> The branch stable/15 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=3bd7deffdda7f9778254f4670e138e4cbac6eb2d commit 3bd7deffdda7f9778254f4670e138e4cbac6eb2d Author: Siva Mahadevan AuthorDate: 2026-02-11 21:50:00 +0000 Commit: Christos Margiolis 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 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