From: "Alex Bennée" <alex.bennee@linaro.org>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: Laurent Vivier <lvivier@redhat.com>,
Thomas Huth <thuth@redhat.com>, Corey Minyard <minyard@acm.org>,
Stefan Berger <stefanb@linux.vnet.ibm.com>,
qemu-devel@nongnu.org, Paolo Bonzini <pbonzini@redhat.com>
Subject: Re: [PATCH 3/3] tests: Avoid side effects inside g_assert() arguments
Date: Tue, 04 May 2021 09:48:39 +0100 [thread overview]
Message-ID: <87wnseop5r.fsf@linaro.org> (raw)
In-Reply-To: <20210503165525.26221-4-peter.maydell@linaro.org>
Peter Maydell <peter.maydell@linaro.org> writes:
> For us, assertions are always enabled, but side-effect expressions
> inside the argument to g_assert() are bad style anyway. Fix three
> occurrences in IPMI related tests, which will silence some Coverity
> nits.
>
> Fixes: CID 1432322, CID 1432287, CID 1432291
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
> tests/qtest/ipmi-bt-test.c | 6 ++++--
> tests/qtest/ipmi-kcs-test.c | 3 ++-
> 2 files changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/tests/qtest/ipmi-bt-test.c b/tests/qtest/ipmi-bt-test.c
> index a42207d416f..8492f02a9c3 100644
> --- a/tests/qtest/ipmi-bt-test.c
> +++ b/tests/qtest/ipmi-bt-test.c
> @@ -98,7 +98,8 @@ static void bt_wait_b_busy(void)
> {
> unsigned int count = 1000;
> while (IPMI_BT_CTLREG_GET_B_BUSY() != 0) {
> - g_assert(--count != 0);
> + --count;
> + g_assert(count != 0);
This does seem a little weird - we are not asserting an interface
violation just that the read should have cleared in 1000 * 100 usec. If
it doesn't is that really a theoretically impossible situation or just
an example of a failed test.
That said looking at how deeply buried in the test these helpers are an
assert is probably better than a convoluted attempt to return out and
exit the test with a failure.
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
> usleep(100);
> }
> }
> @@ -107,7 +108,8 @@ static void bt_wait_b2h_atn(void)
> {
> unsigned int count = 1000;
> while (IPMI_BT_CTLREG_GET_B2H_ATN() == 0) {
> - g_assert(--count != 0);
> + --count;
> + g_assert(count != 0);
> usleep(100);
> }
> }
> diff --git a/tests/qtest/ipmi-kcs-test.c b/tests/qtest/ipmi-kcs-test.c
> index fc0a918c8d1..afc24dd3e46 100644
> --- a/tests/qtest/ipmi-kcs-test.c
> +++ b/tests/qtest/ipmi-kcs-test.c
> @@ -73,7 +73,8 @@ static void kcs_wait_ibf(void)
> {
> unsigned int count = 1000;
> while (IPMI_KCS_CMDREG_GET_IBF() != 0) {
> - g_assert(--count != 0);
> + --count;
> + g_assert(count != 0);
> }
> }
--
Alex Bennée
prev parent reply other threads:[~2021-05-04 9:04 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-03 16:55 [PATCH 0/3] tests: three easy Coverity fixes Peter Maydell
2021-05-03 16:55 ` [PATCH 1/3] tests/qtest/tpm-util.c: Free memory with correct free function Peter Maydell
2021-05-03 16:59 ` Stefan Berger
2021-05-04 8:44 ` Alex Bennée
2021-05-03 16:55 ` [PATCH 2/3] tests/qtest/rtc-test: Remove pointless NULL check Peter Maydell
2021-05-04 5:43 ` Thomas Huth
2021-05-04 8:47 ` Alex Bennée
2021-05-03 16:55 ` [PATCH 3/3] tests: Avoid side effects inside g_assert() arguments Peter Maydell
2021-05-03 17:14 ` Philippe Mathieu-Daudé
2021-05-04 7:18 ` Thomas Huth
2021-05-04 8:46 ` Peter Maydell
2021-05-04 8:48 ` Alex Bennée [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87wnseop5r.fsf@linaro.org \
--to=alex.bennee@linaro.org \
--cc=lvivier@redhat.com \
--cc=minyard@acm.org \
--cc=pbonzini@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanb@linux.vnet.ibm.com \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).