From patchwork Mon Mar 6 14:20:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Brown X-Patchwork-Id: 660286 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4F3DDC678D4 for ; Mon, 6 Mar 2023 14:23:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229509AbjCFOXA (ORCPT ); Mon, 6 Mar 2023 09:23:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34114 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230288AbjCFOWn (ORCPT ); Mon, 6 Mar 2023 09:22:43 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E95FC3527C for ; Mon, 6 Mar 2023 06:21:18 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id EF4F9B80E5C for ; Mon, 6 Mar 2023 14:20:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 76301C4339B; Mon, 6 Mar 2023 14:20:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678112410; bh=60Dvz40Apg10LIVR8Wrt138EIQKfoVEnTzRBhbCLHFI=; h=From:Date:Subject:To:Cc:From; b=S7nnSoDSoKXpiOB6Qmp8N5oxo6tY7Www6cRJRu0n4D4B6MiOgJEZBkuHhUc0ohjpR 9rTTSgyyx/oIgUsRcgrWsuzcLozZnx/GoJPxmxue3q93OD5d9cgXA2gNhabHMKDCqk DOklSGO65SeDhynJeOsHOyM4BjY8eYH5KvROvD5wOkRlVj+JZ504YANdRMXWNCN9Q5 VH8VaOgD3tGgVaVG85h3DzDvGTjNO8WB7ofXVrTmFn0rgK2fMqYiFbmAWPia4Wzwct c224AjqJguq5gAd2zmjsII0W+vwlqYe+K6bxW5BZmLEAPX5qrxv8irBb8RwdnhAjjf CyuqmQQ3CKejA== From: Mark Brown Date: Mon, 06 Mar 2023 14:20:03 +0000 Subject: [PATCH] kselftest/alsa - mixer-test: Don't fail tests if we can't restore default MIME-Version: 1.0 Message-Id: <20230224-alsa-mixer-test-restore-invalid-v1-1-454f0f1f2c4b@kernel.org> X-B4-Tracking: v=1; b=H4sIAJL2BWQC/xWNwQqDQAxEf0VybsBuK7b9leIhq7GG2t2SiC2I/ 272MvCG4c0Gxips8Kg2UF7FJCeH86mCfqL0YpTBGUIdLnUIV6TZCD/yZ8WFbUH1yOqztNIsAwZ q2ni/Ecd2BLdEMsaolPqpeH5Z36X+Ko8uKcfPbt8PwYovk4gAAAA= To: Jaroslav Kysela , Takashi Iwai , Shuah Khan Cc: alsa-devel@alsa-project.org, linux-kselftest@vger.kernel.org, Mark Brown X-Mailer: b4 0.13-dev-bd1bf X-Developer-Signature: v=1; a=openpgp-sha256; l=2369; i=broonie@kernel.org; h=from:subject:message-id; bh=60Dvz40Apg10LIVR8Wrt138EIQKfoVEnTzRBhbCLHFI=; b=owGbwMvMwMWocq27KDak/QLjabUkhhTWbzMk0yMaz7BaGZ+t4mMOsI6NqtV8y2WtbzHft6dpgcY+ kR2djMYsDIxcDLJiiixrn2WsSg+X2Dr/0fxXMINYmUCmMHBxCsBEFIPY/3C+c/Qyn8lw9lXn8mf1D1 80errkit3MkBDU/dDcL/xQ0F/yz+RFR70k1c9fdm3d66bZaPZq24b2iNuV91O2mjHIZJ70c4sWmlop dPVWiLHejPkC0n6htVteMRfcrFm10zozYePdboMHUYYaaRcFf/5+37t7ypN7O+S/tTnrl22wbj3adH KylLN3irDxXc9nFcpZefMYnXQV3n84Pff2gpx35551bu7YzdN168MUpjwzndCm4FWXvZSPv1fN/M+u e9J+Mlui15+lOZprPPylNQIvRa/IUsm3z5nWXC52w7P+tsaMqnWP+qNmWW//8eH5fbOlhX4T5nDeuV kXkTxJMHZm66r65GpJCwbbiwX1AA== X-Developer-Key: i=broonie@kernel.org; a=openpgp; fpr=3F2568AAC26998F9E813A1C5C3F436CA30F5D8EB Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org If a control has an invalid default value then we might fail to set it when restoring the default value after our write tests, for example due to correctly implemented range checks in put() operations. Currently this causes us to report the tests we were running as failed even when the operation we were trying to test is successful, making it look like there are problems where none really exist. Stop doing this, only reporting any issues during the actual test. We already have validation for the initial readback being in spec and for writing the default value back so failed tests will be reported for these controls, and we log an error on the operation that failed when we write so there will be a diagnostic warning the user that there is a problem. Signed-off-by: Mark Brown --- tools/testing/selftests/alsa/mixer-test.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) --- base-commit: fe15c26ee26efa11741a7b632e9f23b01aca4cc6 change-id: 20230224-alsa-mixer-test-restore-invalid-2a57b98aeb7f Best regards, diff --git a/tools/testing/selftests/alsa/mixer-test.c b/tools/testing/selftests/alsa/mixer-test.c index 05f1749ae19d..ac5efa42d488 100644 --- a/tools/testing/selftests/alsa/mixer-test.c +++ b/tools/testing/selftests/alsa/mixer-test.c @@ -755,7 +755,6 @@ static bool test_ctl_write_valid_enumerated(struct ctl_data *ctl) static void test_ctl_write_valid(struct ctl_data *ctl) { bool pass; - int err; /* If the control is turned off let's be polite */ if (snd_ctl_elem_info_is_inactive(ctl->info)) { @@ -797,9 +796,7 @@ static void test_ctl_write_valid(struct ctl_data *ctl) } /* Restore the default value to minimise disruption */ - err = write_and_verify(ctl, ctl->def_val, NULL); - if (err < 0) - pass = false; + write_and_verify(ctl, ctl->def_val, NULL); ksft_test_result(pass, "write_valid.%d.%d\n", ctl->card->card, ctl->elem); @@ -1015,9 +1012,7 @@ static void test_ctl_write_invalid(struct ctl_data *ctl) } /* Restore the default value to minimise disruption */ - err = write_and_verify(ctl, ctl->def_val, NULL); - if (err < 0) - pass = false; + write_and_verify(ctl, ctl->def_val, NULL); ksft_test_result(pass, "write_invalid.%d.%d\n", ctl->card->card, ctl->elem);