Received: by 2002:a25:ad19:0:0:0:0:0 with SMTP id y25csp1509157ybi; Wed, 3 Jul 2019 17:39:13 -0700 (PDT) X-Google-Smtp-Source: APXvYqzHYpIVZJd3Am9pCpQfeAG2TvsLncuBfYhzBUY62dGMGM/eR41nz9PE7J7ctZzv2L4Mt8/v X-Received: by 2002:a17:902:7448:: with SMTP id e8mr3056441plt.85.1562200753501; Wed, 03 Jul 2019 17:39:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562200753; cv=none; d=google.com; s=arc-20160816; b=GsjGx7uKpXVWEkRYwLzMu//v8UmFRG7f3OtvFByCXAsnUzGEcjt3wuUVFRbIb+GipK NLN0pBztn+GiZ39JxgfkkPD2+s51KySx07R6vfIpCSy1xjspQDX0mzasvIjqwdEwcA5a NRaBVdfPrsFwFirQFIMGYuihfBXFUyfWsHO7RFpEpkZC73REjJnnWN9qfznYGR/+bxLf 1syBScPscNlbg66Y2e0X4TzCvEGtucPy/OJunNCQAHlrLZ7MvkTKc3lu5opeBkFH8ZDI t8H4C3Q6cwTQhCDzyBPLF3AEzTqt37CD6lquY6li3/nEBaRnuHP7+GQ3LeYLpzEzacA9 YMPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:from:subject:references :mime-version:message-id:in-reply-to:date:dkim-signature; bh=Fb/CZ+Kk060SdN/y7lfCe8WEta+n71tTYM2wbCGeWoE=; b=lkeKn1Y5m6ecUIk8w0VG9hegbrmmpKiFn8xajc7nDGnyOVdmHiVx1+VyERBVoHqmUa h5OwPAMTrmPSotp25NvUkfTsRnzZtcn3sljnT9jEK26T2naiscqgQcAir+KuzD8PQ4Yb WlY6CFz8sQvA0+tGHZoUX2juPB+JV6i29QbhcVUwkV/5aSjjrjeYA5lO21yQ9iVLHQC4 JXApvLffvTeFGtccYbVoi3gxBg4met4VaIfx604zsOA7zA8hnK75KzVIatHlbV5BOM+c i2KHnhuDN2klFgz0XsujfXvTX5hYfNTiE4HoMsq+XI/INXorwD3NyoIadW9TLjmiknrD AqRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=keBa4C+n; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 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 vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 195si3749723pgc.207.2019.07.03.17.38.58; Wed, 03 Jul 2019 17:39:13 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=keBa4C+n; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 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 S1727401AbfGDAiO (ORCPT + 99 others); Wed, 3 Jul 2019 20:38:14 -0400 Received: from mail-pf1-f201.google.com ([209.85.210.201]:48830 "EHLO mail-pf1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727467AbfGDAiN (ORCPT ); Wed, 3 Jul 2019 20:38:13 -0400 Received: by mail-pf1-f201.google.com with SMTP id u21so2509921pfn.15 for ; Wed, 03 Jul 2019 17:38:12 -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=Fb/CZ+Kk060SdN/y7lfCe8WEta+n71tTYM2wbCGeWoE=; b=keBa4C+nUGSCKBpaKwzuHomGprn6K3hd+KvflhZTaXZXBtv0RkbUYKoJoyVmgBBPle Ro4HGQhFvH5BMRNmwDOXCjX852bE/raXGF0vrVaSNdQOltRLQie8iyXskloZrgHFNUEd nsUNNXw0JaYIW7SdC6TfyE778YL6nVPqJwQNVegD+41skOjSRPtx7Ez54PZUUkYBziLP jbKUq7xNPNJlHYUmYGnI6ckYR7tPB588OthfJXozeZgsEVUNaKrtX4/mgFkr/n/GoGpE r2ThgE2k0ijsNp7cMmqj6mSYBje+jUEcw8/uDx0N6LRYkeDdJI+mlOs1b8KoQXvyMEnD 58Ow== 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=Fb/CZ+Kk060SdN/y7lfCe8WEta+n71tTYM2wbCGeWoE=; b=YvNh66GFpu2IDT6OEsOduopWNXfBNjcyEkAklXXHHMZMxXYV7Yzr0U/PO4Hqx4YQN3 +9Y0M6nSjHwVKiKe+Ot+CPLHgW3ydLDZlQUgn9gcItouRv5p0a50UNflzAzRfHXjfahc CAhQXkdjBh9oPxKDmSDxKAaKKtfFFKkHENaqhA/uXnvJf24idHm6cCWcVq22F44ZYI/f DR48gJwVpdYCS9vfU/pDpt6MtAYWbMwPDRSXxy8Hdc6LgDXV/ocVpQLaEPym7Xez3T2o ikn1OsPypuCpsDQHD8BizQ2Tksi8QxqiVldjbSkpWahl4a5I1xHgEir+Wlkb6kS1INDf k+5A== X-Gm-Message-State: APjAAAXsw6KFCLUz26ZS/JJ8IWqOEoardvmR+yWNGgsYcYO/O+QBd1u8 es6fk7Xm4ScUJDqVJtjJSRgor9pXD+ZBYJt1Pm36xQ== X-Received: by 2002:a63:7c0e:: with SMTP id x14mr39534581pgc.65.1562200692086; Wed, 03 Jul 2019 17:38:12 -0700 (PDT) Date: Wed, 3 Jul 2019 17:36:07 -0700 In-Reply-To: <20190704003615.204860-1-brendanhiggins@google.com> Message-Id: <20190704003615.204860-11-brendanhiggins@google.com> Mime-Version: 1.0 References: <20190704003615.204860-1-brendanhiggins@google.com> X-Mailer: git-send-email 2.22.0.410.gd8fdbe21b5-goog Subject: [PATCH v6 10/18] kunit: test: add tests for kunit test abort From: Brendan Higgins To: frowand.list@gmail.com, gregkh@linuxfoundation.org, jpoimboe@redhat.com, keescook@google.com, kieran.bingham@ideasonboard.com, mcgrof@kernel.org, peterz@infradead.org, robh@kernel.org, sboyd@kernel.org, shuah@kernel.org, tytso@mit.edu, yamada.masahiro@socionext.com Cc: devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org, kunit-dev@googlegroups.com, linux-doc@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-nvdimm@lists.01.org, linux-um@lists.infradead.org, Alexander.Levin@microsoft.com, Tim.Bird@sony.com, amir73il@gmail.com, dan.carpenter@oracle.com, daniel@ffwll.ch, jdike@addtoit.com, joel@jms.id.au, julia.lawall@lip6.fr, khilman@baylibre.com, knut.omang@oracle.com, logang@deltatee.com, mpe@ellerman.id.au, pmladek@suse.com, rdunlap@infradead.org, richard@nod.at, rientjes@google.com, rostedt@goodmis.org, wfg@linux.intel.com, Brendan Higgins 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 Add KUnit tests for the KUnit test abort mechanism (see preceding commit). Add tests both for general try catch mechanism as well as non-architecture specific mechanism. Signed-off-by: Brendan Higgins Reviewed-by: Greg Kroah-Hartman Reviewed-by: Logan Gunthorpe --- kunit/Makefile | 3 +- kunit/test-test.c | 101 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+), 1 deletion(-) create mode 100644 kunit/test-test.c diff --git a/kunit/Makefile b/kunit/Makefile index 1f7680cfa11ad..533355867abd2 100644 --- a/kunit/Makefile +++ b/kunit/Makefile @@ -3,6 +3,7 @@ obj-$(CONFIG_KUNIT) += test.o \ kunit-stream.o \ try-catch.o -obj-$(CONFIG_KUNIT_TEST) += string-stream-test.o +obj-$(CONFIG_KUNIT_TEST) += test-test.o \ + string-stream-test.o obj-$(CONFIG_KUNIT_EXAMPLE_TEST) += example-test.o diff --git a/kunit/test-test.c b/kunit/test-test.c new file mode 100644 index 0000000000000..88f4cdf03db2a --- /dev/null +++ b/kunit/test-test.c @@ -0,0 +1,101 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * KUnit test for core test infrastructure. + * + * Copyright (C) 2019, Google LLC. + * Author: Brendan Higgins + */ +#include + +struct kunit_try_catch_test_context { + struct kunit_try_catch *try_catch; + bool function_called; +}; + +void kunit_test_successful_try(void *data) +{ + struct kunit *test = data; + struct kunit_try_catch_test_context *ctx = test->priv; + + ctx->function_called = true; +} + +void kunit_test_no_catch(void *data) +{ + struct kunit *test = data; + + KUNIT_FAIL(test, "Catch should not be called\n"); +} + +static void kunit_test_try_catch_successful_try_no_catch(struct kunit *test) +{ + struct kunit_try_catch_test_context *ctx = test->priv; + struct kunit_try_catch *try_catch = ctx->try_catch; + + kunit_try_catch_init(try_catch, + test, + kunit_test_successful_try, + kunit_test_no_catch); + kunit_try_catch_run(try_catch, test); + + KUNIT_EXPECT_TRUE(test, ctx->function_called); +} + +void kunit_test_unsuccessful_try(void *data) +{ + struct kunit *test = data; + struct kunit_try_catch_test_context *ctx = test->priv; + struct kunit_try_catch *try_catch = ctx->try_catch; + + kunit_try_catch_throw(try_catch); + KUNIT_FAIL(test, "This line should never be reached\n"); +} + +void kunit_test_catch(void *data) +{ + struct kunit *test = data; + struct kunit_try_catch_test_context *ctx = test->priv; + + ctx->function_called = true; +} + +static void kunit_test_try_catch_unsuccessful_try_does_catch(struct kunit *test) +{ + struct kunit_try_catch_test_context *ctx = test->priv; + struct kunit_try_catch *try_catch = ctx->try_catch; + + kunit_try_catch_init(try_catch, + test, + kunit_test_unsuccessful_try, + kunit_test_catch); + kunit_try_catch_run(try_catch, test); + + KUNIT_EXPECT_TRUE(test, ctx->function_called); +} + +static int kunit_try_catch_test_init(struct kunit *test) +{ + struct kunit_try_catch_test_context *ctx; + + ctx = kunit_kzalloc(test, sizeof(*ctx), GFP_KERNEL); + test->priv = ctx; + + ctx->try_catch = kunit_kmalloc(test, + sizeof(*ctx->try_catch), + GFP_KERNEL); + + return 0; +} + +static struct kunit_case kunit_try_catch_test_cases[] = { + KUNIT_CASE(kunit_test_try_catch_successful_try_no_catch), + KUNIT_CASE(kunit_test_try_catch_unsuccessful_try_does_catch), + {} +}; + +static struct kunit_suite kunit_try_catch_test_suite = { + .name = "kunit-try-catch-test", + .init = kunit_try_catch_test_init, + .test_cases = kunit_try_catch_test_cases, +}; +kunit_test_suite(kunit_try_catch_test_suite); -- 2.22.0.410.gd8fdbe21b5-goog