Received: by 2002:a05:6358:d09b:b0:dc:cd0c:909e with SMTP id jc27csp111743rwb; Tue, 6 Dec 2022 18:06:36 -0800 (PST) X-Google-Smtp-Source: AA0mqf7jp5mECXNNRFHVpWOOG3N5nMtSMoQsgqS9zXURpzzFytmq9s0F80kTnJdyHHzYdBzFLeHG X-Received: by 2002:a17:90a:4089:b0:216:c8ab:3f5b with SMTP id l9-20020a17090a408900b00216c8ab3f5bmr102876488pjg.157.1670378796072; Tue, 06 Dec 2022 18:06:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670378796; cv=none; d=google.com; s=arc-20160816; b=EjdYnGDbXEbspNFacH7ZLuwSGwFFWpWujUG9e4k+Zldpurg5H6MZztoE/PptI3qRBu w4AlQvs17NfSiWhZdcIoqF4FxDHx5vK2n9BtWtaqkb3ZuYA540VFSSh22JFQeRozU8/k pWzBKfOSZ8iNmOKpndtpMTnwpsS3EL5XyFX5wqNHpiuRtIPQmm1gDufJusVOVaAvoAVq QXthBP93uO8tyGBkNoyaBy0crgPpsewGd+Gml0M7h1p6IfvLdd9GA+7eKRErANjE/ZsC 8bLu8X4PxralV4MJb43JJgbf8116WURpxG8nkM6p+pflSxiJvXPdC7hDH9QLjdwsAa5Q UvIw== 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:references :mime-version:in-reply-to:date:dkim-signature; bh=f2Av2mFA0WtwRQfRDDp1AcFtZ65WBT5TfOYBGjpZc8U=; b=moc9I+25pgQZHsvEF+e2xektewewll5n/cAIYP2/i1RxXczh5ORWsg2rMRLpX5Enof N88YdpGyH5fVZqcVbdgGk5YWRFEjxpKUJy5bsBJF9g3Zmw55FANBd+MGoStjKL2rDHig FYFpXcEWtgm2XpeZ3YLCIB5tlwWqHXrThZrJWy7mHQVPw2nPIO9p5Sj+LyEL9l2HciGu rxbH3YJwPL3bxo6dh84/xPXjyogQHRBoybVo33tQfIiVbKksx2+jh1m6B2WLzqaaeYJu og1KJe31/VKEb5DMf3tEGcpZl0XG+RJcq63K9OyvxH+BGm9xn5BNuxWqEhR5l1nViwD5 pLEw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=ZSeF6gIU; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id o12-20020a056a0015cc00b005726c063927si6817291pfu.161.2022.12.06.18.06.03; Tue, 06 Dec 2022 18:06:36 -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=ZSeF6gIU; 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 S229905AbiLGBlI (ORCPT + 77 others); Tue, 6 Dec 2022 20:41:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53262 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229878AbiLGBlF (ORCPT ); Tue, 6 Dec 2022 20:41:05 -0500 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9BA6F326CE for ; Tue, 6 Dec 2022 17:41:04 -0800 (PST) Received: by mail-yb1-xb49.google.com with SMTP id b4-20020a253404000000b006fad1bb09f4so17378647yba.1 for ; Tue, 06 Dec 2022 17:41:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=f2Av2mFA0WtwRQfRDDp1AcFtZ65WBT5TfOYBGjpZc8U=; b=ZSeF6gIU33eO2yCx/RBxl96g1hXO/NUYpPapQeVcTwE4Vg0/fBOlVSrYS97e5ecEHO XNPpGZncy+/Gh7h+b4LSvjIumlhokHRE09Pwo7LwQKIekr8yixl8QCQ0KIukFe02w2wT comOtXMfhFDFAUoy5ivekITX41zI6WVG8czk1z8lYcycv6IVhBJdmK46mlZx35jcXgGF 52pVZ8bzYLziNsMyUyQuMCEgz7XPjBlw0nbxY2WuQhHIoAgQn08onIVu02uiAZ094hGO rj7k4ucJcfb9tH6AEsJFJuADrgzDJeFRHEC1Ct11VgyQJ5N4T7/YnDQOTYD7sdUrRawe sCqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=f2Av2mFA0WtwRQfRDDp1AcFtZ65WBT5TfOYBGjpZc8U=; b=FicpQ4lX+SwAf7iznuca2n/P74kGt0pgpYvZTFTBfw8EXPZc9valq5w+g9RwnxiWKf 4Wvciy9zTGnAxMEERTtKCOASfOxz5kX76eFTdsQibW1e4i1MwQTdbTjj1ZbBQLqrvUsW LKt6SsI8p4JExrZCTFurwvbPsJunViLXW1+T//Qn1rIj5YyhM/4MKF/AKAc0cEJpbgWj /j+WKoYigRvO0MjE4pYS57SWz3dr2nD1wz3gwNd1U8CYOQtQgrQ9XHalrDeHRhmdR05R os2JUANNxf4u6STDsjldJiRTmvrgziRYSTNVR0bAFZAtPCTWvJBkuLlykJW136Jpgx9q XSDg== X-Gm-Message-State: ANoB5pnD/wyjKWCj++Ril54f2DUlsbnnVFpdDl+JMSlfYrApmGnguQ4c r7HniIs0MdIM7hKlDq3oRVgD50Y50g== X-Received: from rmoar.c.googlers.com ([fda3:e722:ac3:cc00:2b:7d90:c0a8:4259]) (user=rmoar job=sendgmr) by 2002:a81:a1ce:0:b0:3bc:16af:8ded with SMTP id y197-20020a81a1ce000000b003bc16af8dedmr50465406ywg.176.1670377263945; Tue, 06 Dec 2022 17:41:03 -0800 (PST) Date: Wed, 7 Dec 2022 01:40:23 +0000 In-Reply-To: <20221207014024.340230-1-rmoar@google.com> Mime-Version: 1.0 References: <20221207014024.340230-1-rmoar@google.com> X-Mailer: git-send-email 2.39.0.rc0.267.gcb52ba06e7-goog Message-ID: <20221207014024.340230-2-rmoar@google.com> Subject: [PATCH v3 1/2] kunit: add macro to allow conditionally exposing static symbols to tests From: Rae Moar To: brendanhiggins@google.com, davidgow@google.com, dlatypov@google.com, john.johansen@canonical.com Cc: skhan@linuxfoundation.org, tales.aparecida@gmail.com, kunit-dev@googlegroups.com, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, apparmor@lists.ubuntu.com, Rae Moar Content-Type: text/plain; charset="UTF-8" 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 Create two macros: VISIBLE_IF_KUNIT - A macro that sets symbols to be static if CONFIG_KUNIT is not enabled. Otherwise if CONFIG_KUNIT is enabled there is no change to the symbol definition. EXPORT_SYMBOL_IF_KUNIT(symbol) - Exports symbol into EXPORTED_FOR_KUNIT_TESTING namespace only if CONFIG_KUNIT is enabled. Must use MODULE_IMPORT_NS(EXPORTED_FOR_KUNIT_TESTING) in test file in order to use symbols. Signed-off-by: Rae Moar Reviewed-by: John Johansen Reviewed-by: David Gow --- Changes since v2: - No changes to this patch. Changes since v1: - Separated the documentation comments for macros. - Changed copyright date and author for new header file. include/kunit/visibility.h | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 include/kunit/visibility.h diff --git a/include/kunit/visibility.h b/include/kunit/visibility.h new file mode 100644 index 000000000000..0dfe35feeec6 --- /dev/null +++ b/include/kunit/visibility.h @@ -0,0 +1,33 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * KUnit API to allow symbols to be conditionally visible during KUnit + * testing + * + * Copyright (C) 2022, Google LLC. + * Author: Rae Moar + */ + +#ifndef _KUNIT_VISIBILITY_H +#define _KUNIT_VISIBILITY_H + +#if IS_ENABLED(CONFIG_KUNIT) + /** + * VISIBLE_IF_KUNIT - A macro that sets symbols to be static if + * CONFIG_KUNIT is not enabled. Otherwise if CONFIG_KUNIT is enabled + * there is no change to the symbol definition. + */ + #define VISIBLE_IF_KUNIT + /** + * EXPORT_SYMBOL_IF_KUNIT(symbol) - Exports symbol into + * EXPORTED_FOR_KUNIT_TESTING namespace only if CONFIG_KUNIT is + * enabled. Must use MODULE_IMPORT_NS(EXPORTED_FOR_KUNIT_TESTING) + * in test file in order to use symbols. + */ + #define EXPORT_SYMBOL_IF_KUNIT(symbol) EXPORT_SYMBOL_NS(symbol, \ + EXPORTED_FOR_KUNIT_TESTING) +#else + #define VISIBLE_IF_KUNIT static + #define EXPORT_SYMBOL_IF_KUNIT(symbol) +#endif + +#endif /* _KUNIT_VISIBILITY_H */ -- 2.39.0.rc0.267.gcb52ba06e7-goog