From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-20.4 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6F8F0C43467 for ; Mon, 12 Oct 2020 22:21:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 30AE920797 for ; Mon, 12 Oct 2020 22:21:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="dJmMJXFc" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389465AbgJLWVy (ORCPT ); Mon, 12 Oct 2020 18:21:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55802 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388883AbgJLWVe (ORCPT ); Mon, 12 Oct 2020 18:21:34 -0400 Received: from mail-qk1-x749.google.com (mail-qk1-x749.google.com [IPv6:2607:f8b0:4864:20::749]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B3E01C0613D1 for ; Mon, 12 Oct 2020 15:21:34 -0700 (PDT) Received: by mail-qk1-x749.google.com with SMTP id u16so13623468qkm.22 for ; Mon, 12 Oct 2020 15:21:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:in-reply-to:message-id:mime-version:references:subject :from:to:cc; bh=3U+Fcas1apO9zkp2uie6RVp/REzkW4tgtQ1I3cCtcMs=; b=dJmMJXFcJsI2IPPVbFmC+XU26TnOljliXdvklavMAECzjqMdwvjfC4zWbJr1MauBff sJjeCU5CqPiySsV54uwvkNtdC53TfYsnFVqS6uOEFS3Eg/90jmnkMifYsWYLAxqa2jzv o9UAL2cBqCX0i7jorUoTNrRJ+UiZJtXUAShkakjeouNLqo+1KT1SR18MBwV1nQCf3q7w NOOiXw2bD3kRzbTNoiGgxl95mVbb74dnq1mmMSoBUmyuByoqv/8ZnoO8zTM8bzR55eVd qFAjR4UG5NH/MQvxg+pWtyujFTjG0YxBrupJ/Ki91H3tlTwoS2xIviwjYH7SaQ+ptReg Pbtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=3U+Fcas1apO9zkp2uie6RVp/REzkW4tgtQ1I3cCtcMs=; b=S1wSmAJ/ZXs8EGb5AohrdbeCdWUPBwjy5/W9GwIrhXmcPVQKWtommONAJXSosqlodI RRKoQYfP2I1zSRKHN/nZ5vgnnA211rTDR+q7tYFVXjN+tcFLVuC+7ZIp1rBl1G9N9J92 c7e7EhuYMcnJXKooxcGpJQ8U+533d2k2ySC+q2pzhnWOtk3t0LFyL9Wixm5zzl1Ztpmd LrKq0wvH/TFCWumlhoAzmsycOBQBOoozS8RfyalDTN+GJGj/jV7z440FmNGOdY+LN+P2 8PhUozXL7cpi5rhcyFVPHE2flCcMKX3WCv12kgTp0EX/Vo4sFjh+lfhhnr6MtcO+s+Yj aGmA== X-Gm-Message-State: AOAM5329lGTwruCSgP+XTODl1QRchBgyJmoqZkoq/IMOT1U3heloD1tI 5S2+BmfPS5jk0DBFj8c1ED5wJYs5iM046g== X-Google-Smtp-Source: ABdhPJwM6iK7jt1J3LI/TsIHXw1h9NcHoyJVKzFqrwix5e3p1NooRLAYVvucmAHzQ7HziKz/+InvjUJgTY2+5Q== Sender: "dlatypov via sendgmr" X-Received: from dlatypov.svl.corp.google.com ([2620:15c:2cd:202:a28c:fdff:fee3:28c6]) (user=dlatypov job=sendgmr) by 2002:ad4:40c6:: with SMTP id x6mr27592944qvp.20.1602541293871; Mon, 12 Oct 2020 15:21:33 -0700 (PDT) Date: Mon, 12 Oct 2020 15:20:47 -0700 In-Reply-To: <20201012222050.999431-1-dlatypov@google.com> Message-Id: <20201012222050.999431-10-dlatypov@google.com> Mime-Version: 1.0 References: <20201012222050.999431-1-dlatypov@google.com> X-Mailer: git-send-email 2.28.0.1011.ga647a8990f-goog Subject: [RFC v2 09/12] kunit: mock: add macro machinery to pick correct format args From: Daniel Latypov To: dlatypov@google.com Cc: alan.maguire@oracle.com, brendanhiggins@google.com, davidgow@google.com, keescook@chromium.org, kunit-dev@googlegroups.com, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, mcgrof@kernel.org, sboyd@kernel.org, skhan@linuxfoundation.org, Marcelo Schmitt Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Marcelo Schmitt Note: It was unclear if there was existing code that could be reused. This is used by DEFINE_MATCHER to generate matching funcs for primitive types that don't trigger compiler warnings. After preprocessing, we now generate matcher func code like kunit_stream_add(stream, "%p not > "%p", actual, matcher->expected) as opposed to the hoping %d will work for all types. Signed-off-by: Marcelo Schmitt Signed-off-by: Daniel Latypov --- lib/kunit/common-mocks.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/lib/kunit/common-mocks.c b/lib/kunit/common-mocks.c index 4d8a3c9d5f0f..ce8929157ded 100644 --- a/lib/kunit/common-mocks.c +++ b/lib/kunit/common-mocks.c @@ -42,6 +42,27 @@ struct mock_param_matcher *kunit_any(struct kunit *test) matcher); \ } +#define TYPE_FRMT(type_name) FORMAT_##type_name +#define FORMAT_u8 "%hu" +#define FORMAT_u16 "%hu" +#define FORMAT_u32 "%u" +#define FORMAT_u64 "%llu" +#define FORMAT_char "%c" +#define FORMAT_uchar "%c" +#define FORMAT_schar "%c" +#define FORMAT_short "%hd" +#define FORMAT_ushort "%hu" +#define FORMAT_int "%d" +#define FORMAT_uint "%u" +#define FORMAT_long "%ld" +#define FORMAT_ulong "%lu" +#define FORMAT_longlong "%lld" +#define FORMAT_ulonglong "%llu" +#define FORMAT_ptr "%p" + +#define CMP_FORMAT(type_name, msg, op) \ + TYPE_FRMT(type_name) msg " " #op " " TYPE_FRMT(type_name) + #define DEFINE_MATCH_FUNC(type_name, type, op_name, op) \ static bool match_##type_name##_##op_name( \ struct mock_param_matcher *pmatcher, \ @@ -55,12 +76,12 @@ struct mock_param_matcher *kunit_any(struct kunit *test) \ if (matches) \ kunit_stream_add(stream, \ - "%d "#op" %d", \ + CMP_FORMAT(type_name, "", op),\ actual, \ matcher->expected); \ else \ kunit_stream_add(stream, \ - "%d not "#op" %d", \ + CMP_FORMAT(type_name, " not", op), \ actual, \ matcher->expected); \ \ -- 2.28.0.1011.ga647a8990f-goog