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=-17.4 required=3.0 tests=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,URIBL_BLOCKED, USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=unavailable 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 EA5A8C3A5A6 for ; Tue, 27 Aug 2019 17:49:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C477121883 for ; Tue, 27 Aug 2019 17:49:48 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="HOn/Th1Q" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730521AbfH0Rts (ORCPT ); Tue, 27 Aug 2019 13:49:48 -0400 Received: from mail-pl1-f202.google.com ([209.85.214.202]:35864 "EHLO mail-pl1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727401AbfH0Rtr (ORCPT ); Tue, 27 Aug 2019 13:49:47 -0400 Received: by mail-pl1-f202.google.com with SMTP id z7so1046685plo.3 for ; Tue, 27 Aug 2019 10:49:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=kBdnxSxfNrFWkVEGyrNiJF2qYM16TCNtAyDwbg8s3Rk=; b=HOn/Th1QKNcSzNR3M0ivHvPiRM2bzQGo8BrsuGTsP0yVKcaY9EThjCVmrGsqv68SRl 08AFZc+Ve9nLv+iuxMWWoQ8TfuoczhlgUagEpq4zf93CTKd5WfjAM71R3eFW1bl8x2kv a/If01mUOn+T/zWriHxXPvCBW8ssCgL7q7AQF+09Dzd8dYLWrmJQrx6Fr4RYWfa9nqr4 fHQiDDcS7vc9ks9Y0T0YBiDTEyShWi/5rmpo4XF6r+rl1EdZOn8wwU5cJSG0qA+IYNtL 7DxPEE9WqIzJhTBvuCB2Y9gMYcXYLFadNIklLwxHR7pfGvIJdBAaoSAsh5dWfLh2K7W1 Ihjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=kBdnxSxfNrFWkVEGyrNiJF2qYM16TCNtAyDwbg8s3Rk=; b=cR1kZdZDW4OPLLQSZA1hKC5bZMtxBReIt5RughMsKPF3RgYsKYQ3TrF2F4jAJjMuPp JEY32LFFr3xEjJkZhzHqwhbNTyBz/T4a6TGY7gCT33Wu2VlFQfjWEoCsMxz69ulOpuT7 UWfH4wbXoKaKhc8E8Mh33ezaannUmD7nrSVx/JBrE/rsH64KLyzH8/gvaI8DXSIZ1pAK 822xpmDA6hQkUvrF2MHxzv0t5cJgdUfWTHjtQdA2473ac2h3GkEueJmVvChw5F5hvl2t ZxRfXPki2ghnIJL2I+0zze44Vjj8Nln3WdtotX1jCvG60sAuQlLrcXqOG7Dfs43g5H58 G+ZQ== X-Gm-Message-State: APjAAAXi7IZOB+jLU02XSbVlDWsmsIh93sotZaIZw+dVJE1MwWEdnVs+ RCcVaLTDx2tblNxHs9V7FJkrrFniDN9lliKquCSkKg== X-Google-Smtp-Source: APXvYqzuY3DB3JPKTCk1lSTX1WmoxGNBIKvHThp1bwIkRjN5dpabp0rDjmzoCO0QjJ5fmhmmeC4w2szCM4IP8kr+EoqdCg== X-Received: by 2002:a63:595d:: with SMTP id j29mr22734669pgm.134.1566928186602; Tue, 27 Aug 2019 10:49:46 -0700 (PDT) Date: Tue, 27 Aug 2019 10:49:32 -0700 Message-Id: <20190827174932.44177-1-brendanhiggins@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.23.0.187.g17f5b7556c-goog Subject: [PATCH v1] kunit: fix failure to build without printk From: Brendan Higgins To: shuah@kernel.org Cc: kunit-dev@googlegroups.com, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, frowand.list@gmail.com, sboyd@kernel.org, Brendan Higgins , Randy Dunlap , Stephen Rothwell Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Previously KUnit assumed that printk would always be present, which is not a valid assumption to make. Fix that by ifdefing out functions which directly depend on printk core functions similar to what dev_printk does. Reported-by: Randy Dunlap Link: https://lore.kernel.org/linux-kselftest/0352fae9-564f-4a97-715a-fabe016259df@kernel.org/T/#t Cc: Stephen Rothwell Signed-off-by: Brendan Higgins --- include/kunit/test.h | 7 +++++++ kunit/test.c | 41 ++++++++++++++++++++++++----------------- 2 files changed, 31 insertions(+), 17 deletions(-) diff --git a/include/kunit/test.h b/include/kunit/test.h index 8b7eb03d4971..339af5f95c4a 100644 --- a/include/kunit/test.h +++ b/include/kunit/test.h @@ -339,9 +339,16 @@ static inline void *kunit_kzalloc(struct kunit *test, size_t size, gfp_t gfp) void kunit_cleanup(struct kunit *test); +#ifdef CONFIG_PRINTK void __printf(3, 4) kunit_printk(const char *level, const struct kunit *test, const char *fmt, ...); +#else +static inline void __printf(3, 4) kunit_printk(const char *level, + const struct kunit *test, + const char *fmt, ...) +{} +#endif /** * kunit_info() - Prints an INFO level message associated with @test. diff --git a/kunit/test.c b/kunit/test.c index b2ca9b94c353..0aa1caf07a6b 100644 --- a/kunit/test.c +++ b/kunit/test.c @@ -16,6 +16,7 @@ static void kunit_set_failure(struct kunit *test) WRITE_ONCE(test->success, false); } +#ifdef CONFIG_PRINTK static int kunit_vprintk_emit(int level, const char *fmt, va_list args) { return vprintk_emit(0, level, NULL, 0, fmt, args); @@ -40,6 +41,29 @@ static void kunit_vprintk(const struct kunit *test, kunit_printk_emit(level[1] - '0', "\t# %s: %pV", test->name, vaf); } +void kunit_printk(const char *level, + const struct kunit *test, + const char *fmt, ...) +{ + struct va_format vaf; + va_list args; + + va_start(args, fmt); + + vaf.fmt = fmt; + vaf.va = &args; + + kunit_vprintk(test, level, &vaf); + + va_end(args); +} +#else /* CONFIG_PRINTK */ +static inline int kunit_printk_emit(int level, const char *fmt, ...) +{ + return 0; +} +#endif /* CONFIG_PRINTK */ + static void kunit_print_tap_version(void) { static bool kunit_has_printed_tap_version; @@ -504,20 +528,3 @@ void kunit_cleanup(struct kunit *test) kunit_resource_free(test, resource); } } - -void kunit_printk(const char *level, - const struct kunit *test, - const char *fmt, ...) -{ - struct va_format vaf; - va_list args; - - va_start(args, fmt); - - vaf.fmt = fmt; - vaf.va = &args; - - kunit_vprintk(test, level, &vaf); - - va_end(args); -} -- 2.23.0.187.g17f5b7556c-goog