From 080c85127e3fba2c8cfb78cb75f7b306aee4028d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20Cochard-Labb=C3=A9?= Date: Fri, 30 Aug 2024 20:23:29 +0300 Subject: [PATCH] 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