From patchwork Tue Jun 8 06:51:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gow X-Patchwork-Id: 12305463 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=-26.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,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 B2557C47082 for ; Tue, 8 Jun 2021 06:51:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8D7DE60FF0 for ; Tue, 8 Jun 2021 06:51:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230269AbhFHGxi (ORCPT ); Tue, 8 Jun 2021 02:53:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42588 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230223AbhFHGxi (ORCPT ); Tue, 8 Jun 2021 02:53:38 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B6C57C061574 for ; Mon, 7 Jun 2021 23:51:33 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id a17-20020a5b09110000b0290547160c87c9so5501664ybq.19 for ; Mon, 07 Jun 2021 23:51:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=el9m4nJm2ABZGSXDbSDzRvh2IOwN+krWXJF343PJuq0=; b=TVpKZCnUIXnWAkU8iVk2TfsLMEF3UFbYS54yNKPP4LARDPoLlYcikn5iURqWn4+1P9 UFGkO098m8w5IB+8Yd1YmYH1JP/x2RXdUXL0NztHtzf9Y0xlGz+LV3RncB0xrMzag2lS uuYlSICwhmFRXVt5Ljmnc16OAPE0PYqo756hD2ry6uJn7hvVZiZNLDz1lUQ7+lgLexMy ejTa1BBf276CH27qMwqIPtHpA4loHyNeexwiuCUasQHEeEnaDvrUC5QyuEAf7k3YNARd KaJMgAdEKMfwDieDoMDr4xJAWBW3EuirKNcrkVm7z2YALiPQRreKWq3OY2cwRcPFU5KC SIsg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=el9m4nJm2ABZGSXDbSDzRvh2IOwN+krWXJF343PJuq0=; b=Op9FuwlrSHBRZG7/kdKwJZ/Xaw0OvFjIuHbkCvEXYgOX92e+8A8NtRy5n7FNUYUagl jN7QvdDZnG4eTX8fUBISTmfPGNPT0tXkdC35ws8NqOfav3FG51qSZHHaBuZITff9RRm2 bAOS/nNA1UlR3XP6pfONZoCOIazKXIXb8xvW+mqpPOh//WVGyibRxnVKxJ1BRncxMRLW pJYzc1H1I4gbhyXkHm+ETuB7Nb1d0APjKu78dBOu5jMDN/rSMb+FIfc6676gm+ISA6lT 3+DMHl8QPmu02qbPAEh37MmeHdDQuV+k/4OwhN6e345uEMgOlG5DG9ubqezUjgbP8Pso fOjw== X-Gm-Message-State: AOAM5312m/NifqdNNviLmmIDesr5K3of7TPP5S6CGSsLNLy4Nbb1oq+Z cE4W7oQcMK6AXa5OQToX2YA7x8BHt/iuAg== X-Google-Smtp-Source: ABdhPJzyPWJlEcZupmOi+AKNU/JJGCCgiB9QzacwxQLd6sGpxGqAiR1NYFJp/GHMQM/ViLfx4L+JauebETqmkw== X-Received: from spirogrip.svl.corp.google.com ([2620:15c:2cb:201:868:b4e3:8c14:177d]) (user=davidgow job=sendgmr) by 2002:a25:a449:: with SMTP id f67mr32854218ybi.388.1623135092957; Mon, 07 Jun 2021 23:51:32 -0700 (PDT) Date: Mon, 7 Jun 2021 23:51:28 -0700 In-Reply-To: <20210608064852.609327-1-davidgow@google.com> Message-Id: <20210608065128.610640-1-davidgow@google.com> Mime-Version: 1.0 References: <20210608064852.609327-1-davidgow@google.com> X-Mailer: git-send-email 2.32.0.rc1.229.g3e70b5a671-goog Subject: [PATCH v3 4/4] kasan: test: make use of kunit_skip() From: David Gow To: Brendan Higgins , Alan Maguire Cc: Marco Elver , Daniel Latypov , Shuah Khan , kunit-dev@googlegroups.com, kasan-dev@googlegroups.com, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, David Gow , Andrey Konovalov Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org From: Marco Elver Make use of the recently added kunit_skip() to skip tests, as it permits TAP parsers to recognize if a test was deliberately skipped. Signed-off-by: Marco Elver Signed-off-by: David Gow Reviewed-by: Daniel Latypov Reviewed-by: Andrey Konovalov Reviewed-by: Brendan Higgins --- No changes since v1 lib/test_kasan.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/lib/test_kasan.c b/lib/test_kasan.c index cacbbbdef768..0a2029d14c91 100644 --- a/lib/test_kasan.c +++ b/lib/test_kasan.c @@ -111,17 +111,13 @@ static void kasan_test_exit(struct kunit *test) } while (0) #define KASAN_TEST_NEEDS_CONFIG_ON(test, config) do { \ - if (!IS_ENABLED(config)) { \ - kunit_info((test), "skipping, " #config " required"); \ - return; \ - } \ + if (!IS_ENABLED(config)) \ + kunit_skip((test), "Test requires " #config "=y"); \ } while (0) #define KASAN_TEST_NEEDS_CONFIG_OFF(test, config) do { \ - if (IS_ENABLED(config)) { \ - kunit_info((test), "skipping, " #config " enabled"); \ - return; \ - } \ + if (IS_ENABLED(config)) \ + kunit_skip((test), "Test requires " #config "=n"); \ } while (0) static void kmalloc_oob_right(struct kunit *test)