From nobody Sun Sep 1 13:29:52 2024 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 4WxXmw2fLZz5VD45; Sun, 01 Sep 2024 13:29:52 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WxXmw24j8z4MLW; Sun, 1 Sep 2024 13:29:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725197392; 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=KFtL5DH0/cZu6egOqt7sdpgP41o+FZUClsa43uGjECM=; b=jGjjxMo1VyheZ+6+5cLhCIadK+tg0fMjN71Foe+vS2g6iyKgL03V38qSHXe5vP2kYPOzEz LSNzzi9If2iGLenE3mqIv15cyfGHfTAjkKy+MAxoSPIzSvGO/SfscwQnUN/3IavOsIyQSM psec3soMThzVqVeALVPK+Q6XqT16/ZpYSEBkA3onvvfGTQaQ2jK9Mbe3A7gsOs1rRA1/5O Y3+1Ocw6wcnZBQhkLIoR9PJeGpx6SBhcay8+fH5S87rZlWFF3KSSgBiAzHcESA1QIPxZdv VibJkcZHWhQwim6n8X784ZdIFt8h/qh/XdJcyqE/vdx2p5fQbQbj8Bgfq9Ae4A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725197392; a=rsa-sha256; cv=none; b=ww1rMsyeyMkKpMI7ASVD8RVpmky4Kgm/f8xz1iA9/GYCi7rzRGwGv5rpyOdSjsZ7c/wYUz fwgIRXC07FZEOJAB+6McFazqRCMjhGB05cDcmRhtmFcPkp6eTHajPn/kZjL8p+WgJcNviN Mu+m/Hp2KI3HT7/3hRkC1wW4GcyI8UyGNxdGvtk9F1gbl5j7vk05zb6kPRhk3XJQN0Qg7x wzDJjmZMPxIZ9xGhOEobWROtxKax9+UmODgBaSPS1sbSgoMlGFh+BF9iIMBxKxkfFr6GU/ Ex8Hqp/Mwf5D4+TQXIcjsl114b6CyQUuavawqq6FLJm1UVBHryTYm1q88zNDsQ== 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=1725197392; 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=KFtL5DH0/cZu6egOqt7sdpgP41o+FZUClsa43uGjECM=; b=itdf3Gcl0FwAFuFl7w1rB09WI71l9YSrWo94PgWkpPQMS9xknIhi/jplxgr6k0uhxvx2aC x4CYSA3HDYUiE31YJdykzqemsQIJDJRCyksnF+8NTcxX5cNNlB/No9gLb3hI9AG+7XJ6Ij TtP6aUz/83wSTkhW/p/s2Vh4YIsP6lo+r4wGAYbRXaUpf8T80MJQ8pvY7DptXilbfGzTWr sKeWUqn4k489bJHls7Kmo/Tq5M2o1KB6AofPt4bdiHQ+w3fmv1ChpSXjUigKYUD5keahCf WfDnSiwTncwPAfgWDHwasWK8hWfX+ZuzrkxXzqv3Y3PIqwkFf/9K/EqqPGpLTg== 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 4WxXmw1Z9jzW4k; Sun, 1 Sep 2024 13:29:52 +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 481DTq9w031291; Sun, 1 Sep 2024 13:29:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 481DTqTr031288; Sun, 1 Sep 2024 13:29:52 GMT (envelope-from git) Date: Sun, 1 Sep 2024 13:29:52 GMT Message-Id: <202409011329.481DTqTr031288@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: b8aeb7101724 - stable/14 - mixer(8) tests: Fix cleanup routine 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: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b8aeb7101724a0489509b3385571759014268e71 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=b8aeb7101724a0489509b3385571759014268e71 commit b8aeb7101724a0489509b3385571759014268e71 Author: Olivier Cochard-Labbé AuthorDate: 2024-08-30 17:23:29 +0000 Commit: Christos Margiolis CommitDate: 2024-09-01 13:29:40 +0000 mixer(8) tests: Fix cleanup routine The tests correctly skip if no snd_dummy neither mixer is found, but the cleanup is still called with the skip condition, which fails if there is no mixer. MFC after: 2 days Reviewed by: christos Differential Revision: https://reviews.freebsd.org/D46491 (cherry picked from commit 080c85127e3fba2c8cfb78cb75f7b306aee4028d) --- usr.sbin/mixer/tests/mixer_test.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.sbin/mixer/tests/mixer_test.sh b/usr.sbin/mixer/tests/mixer_test.sh index e1321ad9ee13..45003251c460 100755 --- a/usr.sbin/mixer/tests/mixer_test.sh +++ b/usr.sbin/mixer/tests/mixer_test.sh @@ -66,7 +66,8 @@ set_default() restore_default() { - test -r "test_mixer_deflt_unit" && mixer -d $(cat test_mixer_deflt_unit) + test -r "test_mixer_deflt_unit" && + mixer -d $(cat test_mixer_deflt_unit) || true } atf_test_case o_flag cleanup