From patchwork Wed Nov 9 21:20:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Latypov X-Patchwork-Id: 17836 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp575388wru; Wed, 9 Nov 2022 13:43:53 -0800 (PST) X-Google-Smtp-Source: AMsMyM4oP4WG8/fNyVNtKJjQOUy4MXBaIKDgLW+oaw2BLaHbl/HjFu8EBX7BTYqWVd6hh4ASGsV3 X-Received: by 2002:a17:902:e5d1:b0:187:3593:a86f with SMTP id u17-20020a170902e5d100b001873593a86fmr47063247plf.15.1668030233534; Wed, 09 Nov 2022 13:43:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668030233; cv=none; d=google.com; s=arc-20160816; b=alLBLCw+pqXqa9NNmBUDwcpxZZlkSYB4+fjKmL+SrYB6pKDvQCSyDem2yfpXDlobtG PXhoe0zYalFBnDwOuDOJpzwNK1DGFhVEJyZnNs8NQ7HoBYfpF8k9+C61Nl4sDa4GXwzC O8S9dsvD/7e8cBTFlbMtPORPpNdgkiTzMjGqeyoCStHAODqD1g/LO7eUpSVuB73D72Ax F+bR/5VVUOnVMYCMyqXaQHSHV6Uxtpf4uwZNq9oRtW1PCMcq9HMUCsT3yfOqXawasNI1 4DxtPhGHZwqsXgfiKgg1iRB6LkIwWrvwOnVUphIyGGlH0lH0cU8YnwPDnQ2giVMjdZOD uniQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:mime-version:date :dkim-signature; bh=9j1Fdjw+QKrP8KK510mV9QHiJhXJjqbCZmYMnpYJD+w=; b=cnbsdWY/XZb0zUvOMo8nS2xG066rxaGrcQwSNLpszde2hn3u3K3Q9iLVxUiy6GNGzR QUGXswoZfauz1nJ1MnAVSLFlRgMM6o8IwrMYBCGMCdsYYV0NI3pARLX112ju5OSro9Tt 2I+DsK2dywytNgHoICZ/F5hYR5ZR5fubdkL66Qq7VmrOEHJYGsrCKbS9UYE+s50WN0tJ cJz+yDUZpBhoPoewyT0v3ri64v8lnCpxwKUSMHAr04JsDPCFXczXNk8BBYPb7tH6NfAm gz/fzIn01nuwpcFGn/425JYm1ieWtelDpy+dPJOqgmixTeuLbXQ5BdorZNKS5TKnNzr5 t7Mg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=lc6wWWvN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s11-20020a170902ea0b00b0017811e3927bsi20555959plg.622.2022.11.09.13.43.40; Wed, 09 Nov 2022 13:43:53 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=lc6wWWvN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231712AbiKIVUl (ORCPT + 99 others); Wed, 9 Nov 2022 16:20:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38524 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231703AbiKIVUj (ORCPT ); Wed, 9 Nov 2022 16:20:39 -0500 Received: from mail-pl1-x649.google.com (mail-pl1-x649.google.com [IPv6:2607:f8b0:4864:20::649]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DC18513DFF for ; Wed, 9 Nov 2022 13:20:38 -0800 (PST) Received: by mail-pl1-x649.google.com with SMTP id b18-20020a170903229200b00186e357f3b9so14103257plh.6 for ; Wed, 09 Nov 2022 13:20:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:mime-version:date:from:to:cc:subject :date:message-id:reply-to; bh=9j1Fdjw+QKrP8KK510mV9QHiJhXJjqbCZmYMnpYJD+w=; b=lc6wWWvNrO5dyaVIDT2ULScb++4l6ht9/mmwQ7XVv4hfdd/ZsFA7RYpeCE04Ig4rOT ft7xWbGZt0pAYXYGDcUBzCCKFcyxGCJxvndT13WIjww8CNWljGbcW65CVwBTkJSDUTuJ TaBMe2liq1yujJ0OMvYv4JkY366+GY7RVqGF+GjQJb9jx5nPxYcJ+0SkRY5hQ9Y0j+WD NfFexaeGObUTniQIwHhCNusmzbXgzKcolmTKOkhtHWDmfQematDe5+OC66ArvNVIfjeG GIadcjaOY4infU6r1EClQJXUBsKuCvdAUs/yVehu4mqGn0wq98RK4a/eSTeZMnjR7MyH SlrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:mime-version:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=9j1Fdjw+QKrP8KK510mV9QHiJhXJjqbCZmYMnpYJD+w=; b=0m9t6hmDOynLJhevKZ7/jIGIog0QQtlSBObTK9OAm+G7hCKt21JOq33AxSapqeMoFt 3aNhOmpMGCKfWC1R5tJ+qMwaBx2Yxn+/KI3hFuh0r/yTVD7f2g3f+8011ilocrWoVwOf Unq2OqPyu5iTwKbG+vtLg/XMyzh0qRiwwF0wFWsc+dKCutPXW2vQe053jzTLCVvagLN9 7XNFS+MF9CbTnnFO4BkZQW6d9K7tENrJp7MnoIIVmPU4Y7faxkkxFz5ROiKWVuaYaRJN Lm2kpMbNi4Te2wN3SOhAvjNtug6acXBPVpaM+V1wKMiJzcdH865jgYk9JH2cv14oYQo+ uRdA== X-Gm-Message-State: ACrzQf2itlpQSxJo7lUfWRV5reIMw7csrx2/QTLdYil0a+/6dgYheOLN lSCBLa76X+Q21ggY8JTBosVPm+DS3r1olA== X-Received: from dlatypov-spec.c.googlers.com ([fda3:e722:ac3:cc00:24:72f4:c0a8:3f35]) (user=dlatypov job=sendgmr) by 2002:a62:e214:0:b0:56c:4303:a93d with SMTP id a20-20020a62e214000000b0056c4303a93dmr1265599pfi.73.1668028838307; Wed, 09 Nov 2022 13:20:38 -0800 (PST) Date: Wed, 9 Nov 2022 13:20:32 -0800 Mime-Version: 1.0 X-Mailer: git-send-email 2.38.1.431.g37b22c650d-goog Message-ID: <20221109212032.123021-1-dlatypov@google.com> Subject: [PATCH] kunit: remove KUNIT_INIT_MEM_ASSERTION macro From: Daniel Latypov To: brendanhiggins@google.com, davidgow@google.com Cc: rmoar@google.com, linux-kernel@vger.kernel.org, kunit-dev@googlegroups.com, linux-kselftest@vger.kernel.org, skhan@linuxfoundation.org, Daniel Latypov X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749056470212397133?= X-GMAIL-MSGID: =?utf-8?q?1749056470212397133?= Commit 870f63b7cd78 ("kunit: eliminate KUNIT_INIT_*_ASSERT_STRUCT macros") removed all the other macros of this type. But it raced with commit b8a926bea8b1 ("kunit: Introduce KUNIT_EXPECT_MEMEQ and KUNIT_EXPECT_MEMNEQ macros"), which added another instance. Remove KUNIT_INIT_MEM_ASSERTION and just use the generic KUNIT_INIT_ASSERT macro instead. Rename the `size` arg to avoid conflicts by appending a "_" (like we did in the previous commit). Signed-off-by: Daniel Latypov Reviewed-by: David Gow --- include/kunit/assert.h | 7 ------- include/kunit/test.h | 12 ++++++------ 2 files changed, 6 insertions(+), 13 deletions(-) base-commit: 870f63b7cd78d0055902d839a60408f7428b4e84 diff --git a/include/kunit/assert.h b/include/kunit/assert.h index 43144cfddc19..24c2b9fa61e8 100644 --- a/include/kunit/assert.h +++ b/include/kunit/assert.h @@ -192,13 +192,6 @@ void kunit_binary_str_assert_format(const struct kunit_assert *assert, const struct va_format *message, struct string_stream *stream); -#define KUNIT_INIT_MEM_ASSERT_STRUCT(text_, left_val, right_val, size_) { \ - .text = text_, \ - .left_value = left_val, \ - .right_value = right_val, \ - .size = size_ \ -} - /** * struct kunit_mem_assert - An expectation/assertion that compares two * memory blocks. diff --git a/include/kunit/test.h b/include/kunit/test.h index d7f60e8aab30..4666a4d199ea 100644 --- a/include/kunit/test.h +++ b/include/kunit/test.h @@ -666,13 +666,13 @@ do { \ left, \ op, \ right, \ - size, \ + size_, \ fmt, \ ...) \ do { \ const void *__left = (left); \ const void *__right = (right); \ - const size_t __size = (size); \ + const size_t __size = (size_); \ static const struct kunit_binary_assert_text __text = { \ .operation = #op, \ .left_text = #left, \ @@ -686,10 +686,10 @@ do { \ assert_type, \ kunit_mem_assert, \ kunit_mem_assert_format, \ - KUNIT_INIT_MEM_ASSERT_STRUCT(&__text, \ - __left, \ - __right, \ - __size), \ + KUNIT_INIT_ASSERT(.text = &__text, \ + .left_value = __left, \ + .right_value = __right, \ + .size = __size), \ fmt, \ ##__VA_ARGS__); \ } while (0)