From nobody Fri Sep 5 18:42:31 2025 X-Original-To: dev-commits-src-main@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 4cJQFM6csfz65yVB; Fri, 05 Sep 2025 18:42:31 +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" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4cJQFM3stJz4P8K; Fri, 05 Sep 2025 18:42:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757097751; 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=wWT4km9YODFR3KnNa+OGhC3PHXcNA0XsFT9VomdZJGA=; b=kfEjZnk6JE32tI9rENuEEH5Wi/czP+jZEZv9ESep9vHZuCDVCEhPmXpWZRT0o0IMTJmP3N F3QYW9oBhVAJMe7833A2gWrRYCx3kGYow+8bkHqb/Wvs6D88A4UsN5gfNzToXnZmkPki+V q6b/5LXCYps+Kld7VMhdQPWlomr9lbSF/eSUIH/E7/zLk+QsAw8Nh5vwt4xBTIRlK+Cbyo axTxnmjzEAnv/QaRkp6wHTUyoheQgRq64G7neKESSATURdEPH5WSPNP5ggp6XQA5JP4P5y RkLQqAXFPu0biujj4H0j6wjcAotCT+Axl4blVAlduAmcqoWWq1GJ1w/APB1K9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1757097751; 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=wWT4km9YODFR3KnNa+OGhC3PHXcNA0XsFT9VomdZJGA=; b=qtit0FRlMhEer618U0cDU28jNAYVBrauRIkIvkY690FtSekLL7XpC9N7BUx5KlnX7hvIyL Zy2jCcBd6GH+KpxhYuFieWgd+6cs01J3AGwD+v4nEDmszCx1/EN2t7/3cAN0k7yk/85tT9 w4lA28cgRH2rjkGIo9iAdJnbchYgwygTwA9Et5H5l3qb0q7Xjl8XyEf8vcdWmrViKJmzxc sKQxE2R8G/oKzyn+lG4yNU666nutSktv4kIdlu2LCopAtO7knFhXYRaWNyulO3Jrvp8xA3 PNIyZihyLnexwdaI8TaoBOJjIvVDa+47CoFn6H6LiWKg2idHv+XPG1PPFbWK3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1757097751; a=rsa-sha256; cv=none; b=pw93eatCQcTn9FpbYaMptwvdkDhKcwSzMq4dP5tPkRtJa1kgz0XDjV3UD1J79FCMrUDe8g SP9LwFUf+r8wCihI+FrDxuNRwnk50FF6EcsjyNtOptqTURUGjCpmwZAh4JgVORduTjxDD3 mDcO3n6YlljiGT0ahqzHl33s09Q4jB7RVsBVOdkTxQHdUUubtuOlLxuZshEO3ccw+QbSl/ v5trGM0pRFCUZAInfMEN1/coWhgniTK2YE0/I71oAmIEyqMhBaVirjxI3wMP3LjnSsfNrH 91/zu/+wbcnZDjSBZ+HwCysPBwaalVzi861GIDfyTKJDZbAhYuWpWed2yZcW6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4cJQFM3T9Vz11Cq; Fri, 05 Sep 2025 18:42:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 585IgVUs096640; Fri, 5 Sep 2025 18:42:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 585IgVjK096637; Fri, 5 Sep 2025 18:42:31 GMT (envelope-from git) Date: Fri, 5 Sep 2025 18:42:31 GMT Message-Id: <202509051842.585IgVjK096637@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 74898ce961e1 - main - tests/sndstat: use require.kmods property instead of ad-hoc checks List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 74898ce961e1f4818eba500dfa3a06bc30c1d9b3 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=74898ce961e1f4818eba500dfa3a06bc30c1d9b3 commit 74898ce961e1f4818eba500dfa3a06bc30c1d9b3 Author: Siva Mahadevan AuthorDate: 2025-07-21 13:25:26 +0000 Commit: Warner Losh CommitDate: 2025-09-05 18:42:22 +0000 tests/sndstat: use require.kmods property instead of ad-hoc checks Signed-off-by: Siva Mahadevan Sponsored by: The FreeBSD Foundation Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1780 --- tests/sys/sound/sndstat.c | 13 ++----------- 1 file 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 #include -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)");