From nobody Sun Feb 8 08:22:17 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2EE05EB64DD for ; Tue, 25 Jul 2023 21:26:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231516AbjGYV0Z (ORCPT ); Tue, 25 Jul 2023 17:26:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56820 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231504AbjGYVZs (ORCPT ); Tue, 25 Jul 2023 17:25:48 -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 6688B2685 for ; Tue, 25 Jul 2023 14:25:43 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-cf4cb742715so6755359276.2 for ; Tue, 25 Jul 2023 14:25:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1690320342; x=1690925142; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=P9AM4snvivssy7wbsIDxQ8HBHmF7mOFqa14w1fvW/F8=; b=5MDPJHFpRS8tRtMD7HzumQ0dmv4Mg4ioTG0yOfG3gxsAWIDO5UQ7AA6LpSKJyI6Rm1 GsnP9eBT8wummS6ZYf6Pw5HF1Rek/IfFaaHrW+WIjI2cmc94qshWdb6b0XR2ZtDP+fK3 E51ad7H7hq1WX2TMA/UGvSupcyOkUI/WesiT1+t2+zWezq/58SrhD6xq9624B6at9vXh vZAmIyRSUx9hKQquUvA3K2nEpWYWSPdNfcIQ42EfoyMiK8XqzKLUnOs8Zlyky1hhpwpV Tr7nyjIEE0R4MRkTW0zimQJC7AsIDDbTunUt5MXOaKmGputJISLxgsUQQDgAofrvMfFw WKPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690320342; x=1690925142; 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=P9AM4snvivssy7wbsIDxQ8HBHmF7mOFqa14w1fvW/F8=; b=gRbWlPtKtv/aT2Re8lpl1q8V/8jGx8w3BYevNRZFROCENbcV8WbFKtiCfT4aNtcqPx zQTaU1J5BxskQDYGmnkiLMy/XB3NoiiQEDPen5zSijh2BXU8p/Mlz82oSZb6AMoM6cKA 1BWJiu5q7c+U6co4lF+JrD4m/2ggNiEZODYXNUiHEUgUm6/gHnyITi28kuxHaOxTC5Jp +zjCK/g7A1+OUkoZt3ewkunztawVJcYIJwsnVu8UkLrECr6m4ym5LjKoQ76U4kVyziUv kUqPYpdVoR+QQ1HDoAz5GxkIUYAqObN6S9lgME+qnZJfzWiFa+sq5BUgDH0uKa79RUKQ MAvQ== X-Gm-Message-State: ABy/qLYSyV++vlfkI+Ho4l2VfZoN1mcYxVYy4vfgDeTYo7l+J+nWad7K PRAE+Trr9cpZ3TEBb5wVL1l4YEgcuw== X-Google-Smtp-Source: APBJJlFCmt7oRxlkGB6KpzQDr1mW8YStaSYdV1LBvCXv9TEzZGowLNs1x8pzgajWNsXp1Fs95OMoXadY8w== X-Received: from rmoar-specialist.c.googlers.com ([fda3:e722:ac3:cc00:2b:7d90:c0a8:45d3]) (user=rmoar job=sendgmr) by 2002:a25:512:0:b0:d0d:cce3:d32d with SMTP id 18-20020a250512000000b00d0dcce3d32dmr1498ybf.6.1690320342696; Tue, 25 Jul 2023 14:25:42 -0700 (PDT) Date: Tue, 25 Jul 2023 21:25:19 +0000 In-Reply-To: <20230725212522.1622716-1-rmoar@google.com> Mime-Version: 1.0 References: <20230725212522.1622716-1-rmoar@google.com> X-Mailer: git-send-email 2.41.0.487.g6d72f3e995-goog Message-ID: <20230725212522.1622716-9-rmoar@google.com> Subject: [PATCH v3 8/9] kunit: add tests for filtering attributes From: Rae Moar To: shuah@kernel.org, davidgow@google.com, dlatypov@google.com, brendan.higgins@linux.dev Cc: linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, linux-kernel@vger.kernel.org, keescook@chromium.org, linux-hardening@vger.kernel.org, jstultz@google.com, tglx@linutronix.de, sboyd@kernel.org, Rae Moar Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add four tests to executor_test.c to test behavior of filtering attributes. - parse_filter_attr_test - to test the parsing of inputted filters - filter_attr_test - to test the filtering procedure on attributes - filter_attr_empty_test - to test the behavior when all tests are filtered out - filter_attr_skip_test - to test the configurable filter_action=3Dskip option Reviewed-by: David Gow Signed-off-by: Rae Moar --- Changes since v2: - No changes. Changes since v1: - No changes. Changes since RFC v2: - Change fake suite and test case names. - Add a few ASSERT statements. Changes since RFC v1: - This is a new patch lib/kunit/executor_test.c | 116 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) diff --git a/lib/kunit/executor_test.c b/lib/kunit/executor_test.c index d7ab069324b5..01280cb8d451 100644 --- a/lib/kunit/executor_test.c +++ b/lib/kunit/executor_test.c @@ -7,6 +7,7 @@ */ =20 #include +#include =20 static void kfree_at_end(struct kunit *test, const void *to_free); static struct kunit_suite *alloc_fake_suite(struct kunit *test, @@ -108,11 +109,126 @@ static void filter_suites_to_empty_test(struct kunit= *test) "should be empty to indicate no match"); } =20 +static void parse_filter_attr_test(struct kunit *test) +{ + int j, filter_count; + struct kunit_attr_filter *parsed_filters; + char *filters =3D "speed>slow, module!=3Dexample"; + int err =3D 0; + + filter_count =3D kunit_get_filter_count(filters); + KUNIT_EXPECT_EQ(test, filter_count, 2); + + parsed_filters =3D kunit_kcalloc(test, filter_count + 1, sizeof(*parsed_f= ilters), + GFP_KERNEL); + for (j =3D 0; j < filter_count; j++) { + parsed_filters[j] =3D kunit_next_attr_filter(&filters, &err); + KUNIT_ASSERT_EQ_MSG(test, err, 0, "failed to parse filter '%s'", filters= [j]); + } + + KUNIT_EXPECT_STREQ(test, kunit_attr_filter_name(parsed_filters[0]), "spee= d"); + KUNIT_EXPECT_STREQ(test, parsed_filters[0].input, ">slow"); + + KUNIT_EXPECT_STREQ(test, kunit_attr_filter_name(parsed_filters[1]), "modu= le"); + KUNIT_EXPECT_STREQ(test, parsed_filters[1].input, "!=3Dexample"); +} + +static struct kunit_case dummy_attr_test_cases[] =3D { + /* .run_case is not important, just needs to be non-NULL */ + { .name =3D "slow", .run_case =3D dummy_test, .module_name =3D "dummy", + .attr.speed =3D KUNIT_SPEED_SLOW }, + { .name =3D "normal", .run_case =3D dummy_test, .module_name =3D "dummy" = }, + {}, +}; + +static void filter_attr_test(struct kunit *test) +{ + struct kunit_suite *subsuite[3] =3D {NULL, NULL}; + struct suite_set suite_set =3D {.start =3D subsuite, .end =3D &subsuite[2= ]}; + struct suite_set got; + int err =3D 0; + + subsuite[0] =3D alloc_fake_suite(test, "normal_suite", dummy_attr_test_ca= ses); + subsuite[1] =3D alloc_fake_suite(test, "slow_suite", dummy_attr_test_case= s); + subsuite[1]->attr.speed =3D KUNIT_SPEED_SLOW; // Set suite attribute + + /* + * Want: normal_suite(slow, normal), slow_suite(slow, normal), + * NULL -> normal_suite(normal), NULL + * + * The normal test in slow_suite is filtered out because the speed + * attribute is unset and thus, the filtering is based on the parent attr= ibute + * of slow. + */ + got =3D kunit_filter_suites(&suite_set, NULL, "speed>slow", NULL, &err); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, got.start); + KUNIT_ASSERT_EQ(test, err, 0); + kfree_at_end(test, got.start); + + /* Validate we just have normal_suite */ + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, got.start[0]); + KUNIT_EXPECT_STREQ(test, got.start[0]->name, "normal_suite"); + KUNIT_ASSERT_EQ(test, got.end - got.start, 1); + + /* Now validate we just have normal test case */ + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, got.start[0]->test_cases); + KUNIT_EXPECT_STREQ(test, got.start[0]->test_cases[0].name, "normal"); + KUNIT_EXPECT_FALSE(test, got.start[0]->test_cases[1].name); +} + +static void filter_attr_empty_test(struct kunit *test) +{ + struct kunit_suite *subsuite[3] =3D {NULL, NULL}; + struct suite_set suite_set =3D {.start =3D subsuite, .end =3D &subsuite[2= ]}; + struct suite_set got; + int err =3D 0; + + subsuite[0] =3D alloc_fake_suite(test, "suite1", dummy_attr_test_cases); + subsuite[1] =3D alloc_fake_suite(test, "suite2", dummy_attr_test_cases); + + got =3D kunit_filter_suites(&suite_set, NULL, "module!=3Ddummy", NULL, &e= rr); + KUNIT_ASSERT_EQ(test, err, 0); + kfree_at_end(test, got.start); /* just in case */ + + KUNIT_EXPECT_PTR_EQ_MSG(test, got.start, got.end, + "should be empty to indicate no match"); +} + +static void filter_attr_skip_test(struct kunit *test) +{ + struct kunit_suite *subsuite[2] =3D {NULL}; + struct suite_set suite_set =3D {.start =3D subsuite, .end =3D &subsuite[1= ]}; + struct suite_set got; + int err =3D 0; + + subsuite[0] =3D alloc_fake_suite(test, "suite", dummy_attr_test_cases); + + /* Want: suite(slow, normal), NULL -> suite(slow with SKIP, normal), NULL= */ + got =3D kunit_filter_suites(&suite_set, NULL, "speed>slow", "skip", &err); + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, got.start); + KUNIT_ASSERT_EQ(test, err, 0); + kfree_at_end(test, got.start); + + /* Validate we have both the slow and normal test */ + KUNIT_ASSERT_NOT_ERR_OR_NULL(test, got.start[0]->test_cases); + KUNIT_ASSERT_EQ(test, kunit_suite_num_test_cases(got.start[0]), 2); + KUNIT_EXPECT_STREQ(test, got.start[0]->test_cases[0].name, "slow"); + KUNIT_EXPECT_STREQ(test, got.start[0]->test_cases[1].name, "normal"); + + /* Now ensure slow is skipped and normal is not */ + KUNIT_EXPECT_EQ(test, got.start[0]->test_cases[0].status, KUNIT_SKIPPED); + KUNIT_EXPECT_FALSE(test, got.start[0]->test_cases[1].status); +} + static struct kunit_case executor_test_cases[] =3D { KUNIT_CASE(parse_filter_test), KUNIT_CASE(filter_suites_test), KUNIT_CASE(filter_suites_test_glob_test), KUNIT_CASE(filter_suites_to_empty_test), + KUNIT_CASE(parse_filter_attr_test), + KUNIT_CASE(filter_attr_test), + KUNIT_CASE(filter_attr_empty_test), + KUNIT_CASE(filter_attr_skip_test), {} }; =20 --=20 2.41.0.487.g6d72f3e995-goog