From patchwork Wed Mar 15 16:48:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Martin Wilck X-Patchwork-Id: 13176382 X-Patchwork-Delegate: christophe.varoqui@free.fr 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 us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 04AE1C7618B for ; Wed, 15 Mar 2023 16:48:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1678898922; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=sm2EuHu5IcfYejIZgwVptMiCGuj42IXb1lXn4IQMt5Q=; b=QIgO9CBkUuLGTVvWXgtRBI0pexDNk53xB2xojKIvTnF5U1oYLIgMa/86VrmLvqCZmHWmBX vfkhWubhR9pCIR/90T0dGiawXAd/9OIbEZPZdNAy+AJvU83z6gUKuDFODgssDAQNYNdKlK YIFQ6/GROm9oLPc1Tn2oKxgykVsCcoY= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-519-KmPDWfOeMjCDzHAop6rYwA-1; Wed, 15 Mar 2023 12:48:38 -0400 X-MC-Unique: KmPDWfOeMjCDzHAop6rYwA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 6E656101A553; Wed, 15 Mar 2023 16:48:36 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (unknown [10.30.29.100]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9189443FBE; Wed, 15 Mar 2023 16:48:33 +0000 (UTC) Received: from mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (localhost [IPv6:::1]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id 55C1619466DF; Wed, 15 Mar 2023 16:48:28 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) by mm-prod-listman-01.mail-001.prod.us-east-1.aws.redhat.com (Postfix) with ESMTP id AF7481946597 for ; Wed, 15 Mar 2023 16:48:26 +0000 (UTC) Received: by smtp.corp.redhat.com (Postfix) id 9D74840C6E67; Wed, 15 Mar 2023 16:48:26 +0000 (UTC) Received: from mimecast-mx02.redhat.com (mimecast02.extmail.prod.ext.rdu2.redhat.com [10.11.55.18]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9681C40BC797 for ; Wed, 15 Mar 2023 16:48:26 +0000 (UTC) Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [205.139.110.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7BE9D801206 for ; Wed, 15 Mar 2023 16:48:26 +0000 (UTC) Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-136-iJrDxRsLMLSe6VTq4uI1eg-1; Wed, 15 Mar 2023 12:48:22 -0400 X-MC-Unique: iJrDxRsLMLSe6VTq4uI1eg-1 Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 433751FD80; Wed, 15 Mar 2023 16:48:21 +0000 (UTC) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 011FC13A00; Wed, 15 Mar 2023 16:48:20 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id LonmOdT2EWS4FQAAMHmgww (envelope-from ); Wed, 15 Mar 2023 16:48:20 +0000 From: mwilck@suse.com To: Christophe Varoqui , Benjamin Marzinski Date: Wed, 15 Mar 2023 17:48:12 +0100 Message-Id: <20230315164813.2939-1-mwilck@suse.com> MIME-Version: 1.0 X-Mimecast-Impersonation-Protect: Policy=CLT - Impersonation Protection Definition; Similar Internal Domain=false; Similar Monitored External Domain=false; Custom External Domain=false; Mimecast External Domain=false; Newly Observed Domain=false; Internal User Name=false; Custom Display Name List=false; Reply-to Address Mismatch=false; Targeted Threat Dictionary=false; Mimecast Threat Dictionary=false; Custom Threat Dictionary=false X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 Subject: [dm-devel] [PATCH] multipath-tools tests: use assert_true/false instead of assert() X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Dirk_M=C3=BCller?= , dm-devel@redhat.com, dmueller@suse.com, Martin Wilck Errors-To: dm-devel-bounces@redhat.com Sender: "dm-devel" X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com From: Dirk Müller Otherwise the build fails with userspace-rcu 0.14 with error: implicit declaration of function 'assert' [-Werror=implicit-function-declaration] note: 'assert' is defined in header ''; did you forget to '#include '? Until liburcu 0.13.0, this didn't show up as a compile error, because "assert.h" was pulled in via config.h -> urcu.h. But these assert() calls should have been cmocka assert macros in the first place. Signed-off-by: Dirk Müller Signed-off-by: Martin Wilck Reviewed-by: Benjamin Marzinski --- tests/util.c | 44 +++++++++++++++++++++----------------------- tests/vpd.c | 2 +- 2 files changed, 22 insertions(+), 24 deletions(-) diff --git a/tests/util.c b/tests/util.c index 9affb0e..d6083dc 100644 --- a/tests/util.c +++ b/tests/util.c @@ -193,7 +193,7 @@ static void test_bitmask_1(void **state) for (j = 0; j < BITARR_SZ; j++) { for (i = 0; i < 64; i++) { b = 64 * j + i; - assert(!is_bit_set_in_bitfield(b, bf)); + assert_false(is_bit_set_in_bitfield(b, bf)); set_bit_in_bitfield(b, bf); for (k = 0; k < BITARR_SZ; k++) { #if 0 @@ -207,13 +207,13 @@ static void test_bitmask_1(void **state) } for (m = 0; m < 64; m++) if (i == m) - assert(is_bit_set_in_bitfield(64 * j + m, - bf)); + assert_true(is_bit_set_in_bitfield(64 * j + m, + bf)); else - assert(!is_bit_set_in_bitfield(64 * j + m, - bf)); + assert_false(is_bit_set_in_bitfield(64 * j + m, + bf)); clear_bit_in_bitfield(b, bf); - assert(!is_bit_set_in_bitfield(b, bf)); + assert_false(is_bit_set_in_bitfield(b, bf)); for (k = 0; k < BITARR_SZ; k++) assert_int_equal(arr[k], 0ULL); } @@ -235,16 +235,16 @@ static void test_bitmask_2(void **state) for (j = 0; j < BITARR_SZ; j++) { for (i = 0; i < 64; i++) { b = 64 * j + i; - assert(!is_bit_set_in_bitfield(b, bf)); + assert_false(is_bit_set_in_bitfield(b, bf)); set_bit_in_bitfield(b, bf); for (m = 0; m < 64; m++) if (m <= i) - assert(is_bit_set_in_bitfield(64 * j + m, - bf)); + assert_true(is_bit_set_in_bitfield(64 * j + m, + bf)); else - assert(!is_bit_set_in_bitfield(64 * j + m, - bf)); - assert(is_bit_set_in_bitfield(b, bf)); + assert_false(is_bit_set_in_bitfield(64 * j + m, + bf)); + assert_true(is_bit_set_in_bitfield(b, bf)); for (k = 0; k < BITARR_SZ; k++) { if (k < j || (k == j && i == 63)) assert_int_equal(arr[k], ~0ULL); @@ -260,16 +260,16 @@ static void test_bitmask_2(void **state) for (j = 0; j < BITARR_SZ; j++) { for (i = 0; i < 64; i++) { b = 64 * j + i; - assert(is_bit_set_in_bitfield(b, bf)); + assert_true(is_bit_set_in_bitfield(b, bf)); clear_bit_in_bitfield(b, bf); for (m = 0; m < 64; m++) if (m <= i) - assert(!is_bit_set_in_bitfield(64 * j + m, - bf)); + assert_false(is_bit_set_in_bitfield(64 * j + m, + bf)); else - assert(is_bit_set_in_bitfield(64 * j + m, - bf)); - assert(!is_bit_set_in_bitfield(b, bf)); + assert_true(is_bit_set_in_bitfield(64 * j + m, + bf)); + assert_false(is_bit_set_in_bitfield(b, bf)); for (k = 0; k < BITARR_SZ; k++) { if (k < j || (k == j && i == 63)) assert_int_equal(arr[k], 0ULL); @@ -316,9 +316,8 @@ static void _test_bitmask_small(unsigned int n) uint32_t *arr; unsigned int size = maybe_swap_idx((n - 1) / 32) + 1, i; - assert(sizeof(bitfield_t) == 4 || sizeof(bitfield_t) == 8); - assert(n <= 64); - assert(n >= 1); + assert_true(sizeof(bitfield_t) == 4 || sizeof(bitfield_t) == 8); + assert_in_range(n, 1, 64); bf = alloc_bitfield(n); assert_non_null(bf); @@ -366,8 +365,7 @@ static void _test_bitmask_small_2(unsigned int n) uint32_t *arr; unsigned int size = maybe_swap_idx((n - 1) / 32) + 1, i; - assert(n <= 128); - assert(n >= 65); + assert_in_range(n, 65, 128); bf = alloc_bitfield(n); assert_non_null(bf); diff --git a/tests/vpd.c b/tests/vpd.c index a7d2092..1b2d62d 100644 --- a/tests/vpd.c +++ b/tests/vpd.c @@ -119,7 +119,7 @@ static void hex2bin(unsigned char *dst, const char *src, const char *sc; unsigned char *ds; - assert(srclen % 2 == 0); + assert_true(srclen % 2 == 0); for (sc = src, ds = dst; sc < src + srclen && ds < dst + dstlen; sc += 2, ++ds)