From nobody Fri Aug 30 17:24:34 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 4WwQ4g1sYtz5MvHP; Fri, 30 Aug 2024 17:24:35 +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 4WwQ4g1Cg6z4JDh; Fri, 30 Aug 2024 17:24:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725038675; 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=SZ7fzrdLUJHCsMc0v2tICdzq8amavTk4dojuX9rRCvk=; b=nTy98ebQEcKyUB+S6JhChrU/6Tq3ovT0YfFAXowFlsr7Ua3ZITi50gyMIlt0Vu4Q1KnGlg tKBtBG+q8PDLAurur92DjDXQlwqrY3VOUwWrRlAVLjfksjiR32NGOMw1BeuJYUZhvvMt4j 0eN/GIpUvH0+dbcDYqKmieGaEciV2jQpBf6WhIRyy2gm/TaQN25HjATQEjLABqbKKNYd4l 9fWCh50bhLbrmcvkHH2qUdbPt1GwF+vNCFwR6k2YpR92WJEX4uhluxuK2OtKZDJvvWrSn2 ztpmkrtUQnABfLRKfL4QqGaoEXy9oX1XL4pUZx1HtD6ptncRcSaJ2eFTkJgMDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725038675; a=rsa-sha256; cv=none; b=ZvnKDHR/foDb2MHtY4q8MUvSiQu0xV19RVLedeuBAo43zC/AaKtoG8mvXOTpsckjAxFxKw 4VVKIWbN3ZVSxZ4YmyOfy6odp3NpZyzkhcozeuD3ELYKLIOR9K8OBcKGgwVFZ3rI69xhRc lyG09x/UmFMVPeONP2q4tlvnpbO3Q45E/XkDbTFOVOSfeJMjK3l7ISdRdLXDMkLu3+ltUS d8s9EMstrfSfpBn2pbFJPA/L0PDuuzMXbNgOKRtH3p5YcGhokUs0ydNR1sGNboOMthf9Al ZGqGzgy/rZCXgnGtIJ9IInhIKEFWL9xtw/R+dHv8lf5Wxl3opTUB38UdKFmTfg== 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=1725038675; 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=SZ7fzrdLUJHCsMc0v2tICdzq8amavTk4dojuX9rRCvk=; b=O0/WIK6nj9aw6GOBMZMnDisGxIYxcyJSej6GxWRzb/P9+WXE61Yy5IPvaK2VWvuCaPHyS5 J3FrJz/WObOAbzCmaSbT57Z/MspUSR1QDywVr/WN4bhggZsrqcuFF8NXF0yW8cfvWpo+Jn uUNia9bmZHtPLv+8sQ5Nvlr2nAlABYtBY46KPf3HiUcxI6ilSwIQXAEZxSbD2u+ok1vf7u zutj8aY+55XU1oJmNPbVVDifirMRujCfbQdLU9fxsbSBkhR0aU9vUwtaY+nIdhJxkIfIFM Li/XLsZ0ZaplHZRnRiEihqsEk+t4YsWtkXKkxM4ZA42S8o/yYw+DnIE7US5Qvw== 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 4WwQ4g0h8Jz1801; Fri, 30 Aug 2024 17:24:35 +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 47UHOYRU061542; Fri, 30 Aug 2024 17:24:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47UHOYKR061539; Fri, 30 Aug 2024 17:24:34 GMT (envelope-from git) Date: Fri, 30 Aug 2024 17:24:34 GMT Message-Id: <202408301724.47UHOYKR061539@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 080c85127e3f - main - 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/main X-Git-Reftype: branch X-Git-Commit: 080c85127e3fba2c8cfb78cb75f7b306aee4028d Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=080c85127e3fba2c8cfb78cb75f7b306aee4028d commit 080c85127e3fba2c8cfb78cb75f7b306aee4028d Author: Olivier Cochard-Labbé AuthorDate: 2024-08-30 17:23:29 +0000 Commit: Christos Margiolis CommitDate: 2024-08-30 17:23:29 +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 --- 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