From nobody Fri Jan 9 00:38:44 2026 Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9FE8226F291 for ; Tue, 6 Jan 2026 14:11:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767708667; cv=none; b=OI8hxAou6k2GjzYogtJeUXDABWLvBiY47/9xYpB532NqlZ1WEC1W2Q+2bavae86PFZAkQB4Xs1oUtnEgzkKGQu1QTv20wmwpXIBU8yrX2+PUyZc0BD8CxhFPoM5juuca/J+eCeM7RMtEQC2M68iQ2y2bzULLN0JPnw8y2pvfVw8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1767708667; c=relaxed/simple; bh=u09dtXgCIwMT26eYnWKDgLX3K5Y6hs1K0ePjg4T0Iok=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=PxcnJqlUDsGjuuaOprAAcMwniRRxUZKYaiLfhf6XCP6ZeOK/zXI+RuA6IVxHzkwOJ8cEYTeA5dxfhEL6gTHRRGtzSYJS55VKQ7CcgfeftuVXz/3xDTe40gzegLnAHab/g0vzFcOaWFdLH0mwgoqcuGKXkxE9JomUnkd97Z67eN8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=hotmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=QNW6j5eE; arc=none smtp.client-ip=209.85.210.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=none dis=none) header.from=hotmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="QNW6j5eE" Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-7bab7c997eeso1173580b3a.0 for ; Tue, 06 Jan 2026 06:11:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1767708665; x=1768313465; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=4vDUrunjes9H3jNg5Q6zJYtPPd5qlgYkQQ94yXngF/E=; b=QNW6j5eEi5fwZCaEGjA9UkeiYIPw1YnGcdWkP1kb7sxlklhPGABwUqZctXoUc3kfxa yEUBp4pNmrIxBfpMkqJroPnZHWnuoIh1nqgFwHkqggDFEvekU+pAlG239uyG89sUVIWH JH6Ump6beQW3U3XmL6WgJeQ0nlbGwyjHfNwi7hca/I+TCF35ykFuRbUI5mZKqYSRBGFZ 7J73R45nFw4dd83zMXv9daNKYRk3XJX9Lbgz1bDNeacrWZhiyGvgpofTmUyyBUnEMdSB J/7JHl5RMu49Z7+Qa/zR4+RNVTW4Jg5WdgbLL4tfCj3TDuCOS7DONZmhbkaZfWf1ao6l DbFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767708665; x=1768313465; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=4vDUrunjes9H3jNg5Q6zJYtPPd5qlgYkQQ94yXngF/E=; b=Y4yCtXK36050vw2AwnAWVV3RwXhD5LreqIz9DmuU/dVCehFxs5csmx2rucW7sVmDNk h2wQH4isUIcuqoiQfsTmC83ykqeyV3zfQ+P2WMX/c39CmmHgdq0A9+v2HpzncNr0MBge Uy9gYcmGrdB5OaWnHW6sC06AJ3p/I4XaX/sNiDjQD7K68bZ1sYRfrRSZhp2BVJhA5PTI NoZAONV5s/mcXb8ZRP4UQnMzPK3VLG6t5/ikKfLwNtMtYybz7RDOsTvMd99Ws6qEMmF6 cx9qzcx0UHUX7xlN9UEDMLUL+8wwuMLWDzQjAv5pvOxVSr8hsISNQYHAiPhC4PKdfFS1 nTPw== X-Gm-Message-State: AOJu0YwPIpnE2cfjYn+fS/bCO+zmodLD1CcXeAwpD6BFI7yWA8fVfo5X 2LaRIX387T3efLNHB4k3dupUb+zAxZwwRuAeJWQijsJjMteVnXG8n+Yo X-Gm-Gg: AY/fxX43CWHLWTGBdsCBnk3NcaUstYe35aqcvRItC84GtxnLybXlH9VEfb/FAdZ0Xzb yi7aGAk/deUWW9ENJfu/J+09nIjiJzxMOHwAsR0Wz7ldRBb2gWfLY/p7ky/NxKct+5AmVhE6WK3 sWPQyeQoOjLkxII0wWekT1SYkcORn3gtn/qOZRAuEQWdxWBHuc6yXQCFT3ttwvhCTVlpJvjTmoY kvnDSN19FVrEcxarKQDELd5oFw+Aw8kTiEl5V5+743I2Jafi/w4SoSuFjZLzjWhj8+ZMNVlh96d hnHR/FIloxHNuls31K87lYUgdwuzXwEzowsfUvmfJESU0jVonNKyTG7g0u/864/MeFvzpC7zafV etHv3TP6AkyNKturhc9PpuuVzsh6GoWAYnxM9W5Gq/DsJk6cdq6PyseZwCXrBcZWAKbzS2V2Yzi sbscnwmkEFIjo0m1Sofvrbpgw1gzxxRHAj5/6VdSEYvBGNMa9cuswmVYtgJ6LV0PcUNkqO0AGun 9DyrUHnOisyZOQpy/Pnmo4= X-Google-Smtp-Source: AGHT+IHVNofqp9uKNKtbPDrQV6Cjbxd/mPxw1jWbN5K/jeRZ/Rb/U+erZ7RK4TG9M8w7UpGKO58Wxg== X-Received: by 2002:a05:6a20:12d5:b0:361:3bdb:26df with SMTP id adf61e73a8af0-3898223bc0emr2446332637.5.1767708664596; Tue, 06 Jan 2026 06:11:04 -0800 (PST) Received: from kirchou-macbookpro2.roam.corp.google.com (softbank126227055022.bbtec.net. [126.227.55.22]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-c4cb5352268sm2552205a12.0.2026.01.06.06.11.01 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 06 Jan 2026 06:11:03 -0800 (PST) Sender: kir <610548@gmail.com> From: Kir Chou To: akpm@linux-foundation.org, geert@linux-m68k.org Cc: linux-kernel@vger.kernel.org, davidgow@google.com, brendan.higgins@linux.dev, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, kirchou@google.com, Kir Chou Subject: [PATCH v2] lib/glob: convert selftest to KUnit Date: Tue, 6 Jan 2026 23:10:57 +0900 Message-ID: <20260106141057.91203-1-note351@hotmail.com> X-Mailer: git-send-email 2.52.0.351.gbe84eed79e-goog Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This patch converts the existing glob selftest (lib/globtest.c) to use the KUnit framework (lib/glob_kunit.c). The new test: - Migrates all 64 test cases from the original test to the KUnit suite. - Removes the custom 'verbose' module parameter as KUnit handles logging. - Updates Kconfig.debug and Makefile to support the new KUnit test. - Updates Kconfig and Makefile to remove the original selftest. - Updates GLOB_SELFTEST to GLOB_KUNIT_TEST for arch/m68k/configs. This commit is verified by `./tools/testing/kunit/kunit.py run` with the .kunit/.kunitconfig: ``` CONFIG_KUNIT=3Dy CONFIG_GLOB_KUNIT_TEST=3Dy ``` Signed-off-by: Kir Chou Acked-by: Geert Uytterhoeven Reviewed-by: David Gow --- v2: - Remove CONFIG_GLOB_KUNIT_TEST from defconfigs as it's implicitly enabled by CONFIG_KUNIT_ALL_TESTS. (Suggested by Geert) --- arch/m68k/configs/amiga_defconfig | 1 - arch/m68k/configs/apollo_defconfig | 1 - arch/m68k/configs/atari_defconfig | 1 - arch/m68k/configs/bvme6000_defconfig | 1 - arch/m68k/configs/hp300_defconfig | 1 - arch/m68k/configs/mac_defconfig | 1 - arch/m68k/configs/multi_defconfig | 1 - arch/m68k/configs/mvme147_defconfig | 1 - arch/m68k/configs/mvme16x_defconfig | 1 - arch/m68k/configs/q40_defconfig | 1 - arch/m68k/configs/sun3_defconfig | 1 - arch/m68k/configs/sun3x_defconfig | 1 - lib/Kconfig | 13 --- lib/Kconfig.debug | 13 +++ lib/Makefile | 2 +- lib/glob_kunit.c | 122 +++++++++++++++++++ lib/globtest.c | 167 --------------------------- 17 files changed, 136 insertions(+), 193 deletions(-) create mode 100644 lib/glob_kunit.c delete mode 100644 lib/globtest.c diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_de= fconfig index bfc1ee7c8..b51e22dea 100644 --- a/arch/m68k/configs/amiga_defconfig +++ b/arch/m68k/configs/amiga_defconfig @@ -600,7 +600,6 @@ CONFIG_CRYPTO_USER_API_AEAD=3Dm CONFIG_PRIME_NUMBERS=3Dm CONFIG_CRC_BENCHMARK=3Dy CONFIG_XZ_DEC_TEST=3Dm -CONFIG_GLOB_SELFTEST=3Dm # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set CONFIG_MAGIC_SYSRQ=3Dy CONFIG_TEST_LOCKUP=3Dm diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_= defconfig index d9d1f3c4c..bb326aabe 100644 --- a/arch/m68k/configs/apollo_defconfig +++ b/arch/m68k/configs/apollo_defconfig @@ -557,7 +557,6 @@ CONFIG_CRYPTO_USER_API_AEAD=3Dm CONFIG_PRIME_NUMBERS=3Dm CONFIG_CRC_BENCHMARK=3Dy CONFIG_XZ_DEC_TEST=3Dm -CONFIG_GLOB_SELFTEST=3Dm # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set CONFIG_MAGIC_SYSRQ=3Dy CONFIG_TEST_LOCKUP=3Dm diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_de= fconfig index 523205adc..66af496e0 100644 --- a/arch/m68k/configs/atari_defconfig +++ b/arch/m68k/configs/atari_defconfig @@ -577,7 +577,6 @@ CONFIG_CRYPTO_USER_API_AEAD=3Dm CONFIG_PRIME_NUMBERS=3Dm CONFIG_CRC_BENCHMARK=3Dy CONFIG_XZ_DEC_TEST=3Dm -CONFIG_GLOB_SELFTEST=3Dm # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set CONFIG_MAGIC_SYSRQ=3Dy CONFIG_TEST_LOCKUP=3Dm diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6= 000_defconfig index 7b0a4ef0b..935282b27 100644 --- a/arch/m68k/configs/bvme6000_defconfig +++ b/arch/m68k/configs/bvme6000_defconfig @@ -549,7 +549,6 @@ CONFIG_CRYPTO_USER_API_AEAD=3Dm CONFIG_PRIME_NUMBERS=3Dm CONFIG_CRC_BENCHMARK=3Dy CONFIG_XZ_DEC_TEST=3Dm -CONFIG_GLOB_SELFTEST=3Dm # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set CONFIG_MAGIC_SYSRQ=3Dy CONFIG_TEST_LOCKUP=3Dm diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_de= fconfig index 089c5c394..31f5220be 100644 --- a/arch/m68k/configs/hp300_defconfig +++ b/arch/m68k/configs/hp300_defconfig @@ -559,7 +559,6 @@ CONFIG_CRYPTO_USER_API_AEAD=3Dm CONFIG_PRIME_NUMBERS=3Dm CONFIG_CRC_BENCHMARK=3Dy CONFIG_XZ_DEC_TEST=3Dm -CONFIG_GLOB_SELFTEST=3Dm # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set CONFIG_MAGIC_SYSRQ=3Dy CONFIG_TEST_LOCKUP=3Dm diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defcon= fig index 5f2484c36..99fa2286a 100644 --- a/arch/m68k/configs/mac_defconfig +++ b/arch/m68k/configs/mac_defconfig @@ -576,7 +576,6 @@ CONFIG_CRYPTO_USER_API_AEAD=3Dm CONFIG_PRIME_NUMBERS=3Dm CONFIG_CRC_BENCHMARK=3Dy CONFIG_XZ_DEC_TEST=3Dm -CONFIG_GLOB_SELFTEST=3Dm # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set CONFIG_MAGIC_SYSRQ=3Dy CONFIG_TEST_LOCKUP=3Dm diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_de= fconfig index 74f0a1f6d..9332c00bc 100644 --- a/arch/m68k/configs/multi_defconfig +++ b/arch/m68k/configs/multi_defconfig @@ -663,7 +663,6 @@ CONFIG_CRYPTO_USER_API_AEAD=3Dm CONFIG_PRIME_NUMBERS=3Dm CONFIG_CRC_BENCHMARK=3Dy CONFIG_XZ_DEC_TEST=3Dm -CONFIG_GLOB_SELFTEST=3Dm # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set CONFIG_MAGIC_SYSRQ=3Dy CONFIG_TEST_LOCKUP=3Dm diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme14= 7_defconfig index 4bee18c82..e5ba3e899 100644 --- a/arch/m68k/configs/mvme147_defconfig +++ b/arch/m68k/configs/mvme147_defconfig @@ -549,7 +549,6 @@ CONFIG_CRYPTO_USER_API_AEAD=3Dm CONFIG_PRIME_NUMBERS=3Dm CONFIG_CRC_BENCHMARK=3Dy CONFIG_XZ_DEC_TEST=3Dm -CONFIG_GLOB_SELFTEST=3Dm # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set CONFIG_MAGIC_SYSRQ=3Dy CONFIG_TEST_LOCKUP=3Dm diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16= x_defconfig index 322c17e55..282900b7e 100644 --- a/arch/m68k/configs/mvme16x_defconfig +++ b/arch/m68k/configs/mvme16x_defconfig @@ -550,7 +550,6 @@ CONFIG_CRYPTO_USER_API_AEAD=3Dm CONFIG_PRIME_NUMBERS=3Dm CONFIG_CRC_BENCHMARK=3Dy CONFIG_XZ_DEC_TEST=3Dm -CONFIG_GLOB_SELFTEST=3Dm # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set CONFIG_MAGIC_SYSRQ=3Dy CONFIG_TEST_LOCKUP=3Dm diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defcon= fig index 82f9baab8..e572c7df1 100644 --- a/arch/m68k/configs/q40_defconfig +++ b/arch/m68k/configs/q40_defconfig @@ -566,7 +566,6 @@ CONFIG_CRYPTO_USER_API_AEAD=3Dm CONFIG_PRIME_NUMBERS=3Dm CONFIG_CRC_BENCHMARK=3Dy CONFIG_XZ_DEC_TEST=3Dm -CONFIG_GLOB_SELFTEST=3Dm # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set CONFIG_MAGIC_SYSRQ=3Dy CONFIG_TEST_LOCKUP=3Dm diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defc= onfig index f94ad226c..03bd60c5b 100644 --- a/arch/m68k/configs/sun3_defconfig +++ b/arch/m68k/configs/sun3_defconfig @@ -547,7 +547,6 @@ CONFIG_CRYPTO_USER_API_AEAD=3Dm CONFIG_PRIME_NUMBERS=3Dm CONFIG_CRC_BENCHMARK=3Dy CONFIG_XZ_DEC_TEST=3Dm -CONFIG_GLOB_SELFTEST=3Dm # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set CONFIG_MAGIC_SYSRQ=3Dy CONFIG_TEST_LOCKUP=3Dm diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_de= fconfig index a5ecfc505..0fba766ce 100644 --- a/arch/m68k/configs/sun3x_defconfig +++ b/arch/m68k/configs/sun3x_defconfig @@ -547,7 +547,6 @@ CONFIG_CRYPTO_USER_API_AEAD=3Dm CONFIG_PRIME_NUMBERS=3Dm CONFIG_CRC_BENCHMARK=3Dy CONFIG_XZ_DEC_TEST=3Dm -CONFIG_GLOB_SELFTEST=3Dm # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set CONFIG_MAGIC_SYSRQ=3Dy CONFIG_TEST_LOCKUP=3Dm diff --git a/lib/Kconfig b/lib/Kconfig index 2923924be..0f2fb9610 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -430,19 +430,6 @@ config GLOB are compiling an out-of tree driver which tells you that it depends on this. =20 -config GLOB_SELFTEST - tristate "glob self-test on init" - depends on GLOB - help - This option enables a simple self-test of the glob_match - function on startup. It is primarily useful for people - working on the code to ensure they haven't introduced any - regressions. - - It only adds a little bit of code and slows kernel boot (or - module load) by a small amount, so you're welcome to play with - it, but you probably don't need it. - # # Netlink attribute parsing support is select'ed if needed # diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index ba36939fd..e4347e145 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -3354,6 +3354,19 @@ config PRIME_NUMBERS_KUNIT_TEST =20 If unsure, say N =20 +config GLOB_KUNIT_TEST + tristate "Glob matching test" if !KUNIT_ALL_TESTS + depends on KUNIT + default KUNIT_ALL_TESTS + select GLOB + help + Enable this option to test the glob functions at runtime. + + This test suite verifies the correctness of glob_match() across various + scenarios, including edge cases. + + If unsure, say N + endif # RUNTIME_TESTING_MENU =20 config ARCH_USE_MEMTEST diff --git a/lib/Makefile b/lib/Makefile index aaf677cf4..78d7deabe 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -226,7 +226,7 @@ obj-$(CONFIG_CLOSURES) +=3D closure.o obj-$(CONFIG_DQL) +=3D dynamic_queue_limits.o =20 obj-$(CONFIG_GLOB) +=3D glob.o -obj-$(CONFIG_GLOB_SELFTEST) +=3D globtest.o +obj-$(CONFIG_GLOB_KUNIT_TEST) +=3D glob_kunit.o =20 obj-$(CONFIG_DIMLIB) +=3D dim/ obj-$(CONFIG_SIGNATURE) +=3D digsig.o diff --git a/lib/glob_kunit.c b/lib/glob_kunit.c new file mode 100644 index 000000000..797e32a8c --- /dev/null +++ b/lib/glob_kunit.c @@ -0,0 +1,122 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Test cases for glob functions. + */ + +#include +#include +#include + +struct glob_test_case { + // Pattern to match. + const char *pat; + // String to match against. + const char *str; + // Expected glob_match result, true is matched. + bool expected; +}; + +static const struct glob_test_case glob_test_cases[] =3D { + /* Some basic tests */ + { .pat =3D "a", .str =3D "a", .expected =3D true }, + { .pat =3D "a", .str =3D "b", .expected =3D false }, + { .pat =3D "a", .str =3D "aa", .expected =3D false }, + { .pat =3D "a", .str =3D "", .expected =3D false }, + { .pat =3D "", .str =3D "", .expected =3D true }, + { .pat =3D "", .str =3D "a", .expected =3D false }, + /* Simple character class tests */ + { .pat =3D "[a]", .str =3D "a", .expected =3D true }, + { .pat =3D "[a]", .str =3D "b", .expected =3D false }, + { .pat =3D "[!a]", .str =3D "a", .expected =3D false }, + { .pat =3D "[!a]", .str =3D "b", .expected =3D true }, + { .pat =3D "[ab]", .str =3D "a", .expected =3D true }, + { .pat =3D "[ab]", .str =3D "b", .expected =3D true }, + { .pat =3D "[ab]", .str =3D "c", .expected =3D false }, + { .pat =3D "[!ab]", .str =3D "c", .expected =3D true }, + { .pat =3D "[a-c]", .str =3D "b", .expected =3D true }, + { .pat =3D "[a-c]", .str =3D "d", .expected =3D false }, + /* Corner cases in character class parsing */ + { .pat =3D "[a-c-e-g]", .str =3D "-", .expected =3D true }, + { .pat =3D "[a-c-e-g]", .str =3D "d", .expected =3D false }, + { .pat =3D "[a-c-e-g]", .str =3D "f", .expected =3D true }, + { .pat =3D "[]a-ceg-ik[]", .str =3D "a", .expected =3D true }, + { .pat =3D "[]a-ceg-ik[]", .str =3D "]", .expected =3D true }, + { .pat =3D "[]a-ceg-ik[]", .str =3D "[", .expected =3D true }, + { .pat =3D "[]a-ceg-ik[]", .str =3D "h", .expected =3D true }, + { .pat =3D "[]a-ceg-ik[]", .str =3D "f", .expected =3D false }, + { .pat =3D "[!]a-ceg-ik[]", .str =3D "h", .expected =3D false }, + { .pat =3D "[!]a-ceg-ik[]", .str =3D "]", .expected =3D false }, + { .pat =3D "[!]a-ceg-ik[]", .str =3D "f", .expected =3D true }, + /* Simple wild cards */ + { .pat =3D "?", .str =3D "a", .expected =3D true }, + { .pat =3D "?", .str =3D "aa", .expected =3D false }, + { .pat =3D "??", .str =3D "a", .expected =3D false }, + { .pat =3D "?x?", .str =3D "axb", .expected =3D true }, + { .pat =3D "?x?", .str =3D "abx", .expected =3D false }, + { .pat =3D "?x?", .str =3D "xab", .expected =3D false }, + /* Asterisk wild cards (backtracking) */ + { .pat =3D "*??", .str =3D "a", .expected =3D false }, + { .pat =3D "*??", .str =3D "ab", .expected =3D true }, + { .pat =3D "*??", .str =3D "abc", .expected =3D true }, + { .pat =3D "*??", .str =3D "abcd", .expected =3D true }, + { .pat =3D "??*", .str =3D "a", .expected =3D false }, + { .pat =3D "??*", .str =3D "ab", .expected =3D true }, + { .pat =3D "??*", .str =3D "abc", .expected =3D true }, + { .pat =3D "??*", .str =3D "abcd", .expected =3D true }, + { .pat =3D "?*?", .str =3D "a", .expected =3D false }, + { .pat =3D "?*?", .str =3D "ab", .expected =3D true }, + { .pat =3D "?*?", .str =3D "abc", .expected =3D true }, + { .pat =3D "?*?", .str =3D "abcd", .expected =3D true }, + { .pat =3D "*b", .str =3D "b", .expected =3D true }, + { .pat =3D "*b", .str =3D "ab", .expected =3D true }, + { .pat =3D "*b", .str =3D "ba", .expected =3D false }, + { .pat =3D "*b", .str =3D "bb", .expected =3D true }, + { .pat =3D "*b", .str =3D "abb", .expected =3D true }, + { .pat =3D "*b", .str =3D "bab", .expected =3D true }, + { .pat =3D "*bc", .str =3D "abbc", .expected =3D true }, + { .pat =3D "*bc", .str =3D "bc", .expected =3D true }, + { .pat =3D "*bc", .str =3D "bbc", .expected =3D true }, + { .pat =3D "*bc", .str =3D "bcbc", .expected =3D true }, + /* Multiple asterisks (complex backtracking) */ + { .pat =3D "*ac*", .str =3D "abacadaeafag", .expected =3D true }, + { .pat =3D "*ac*ae*ag*", .str =3D "abacadaeafag", .expected =3D true }, + { .pat =3D "*a*b*[bc]*[ef]*g*", .str =3D "abacadaeafag", .expected =3D tr= ue }, + { .pat =3D "*a*b*[ef]*[cd]*g*", .str =3D "abacadaeafag", .expected =3D fa= lse }, + { .pat =3D "*abcd*", .str =3D "abcabcabcabcdefg", .expected =3D true }, + { .pat =3D "*ab*cd*", .str =3D "abcabcabcabcdefg", .expected =3D true }, + { .pat =3D "*abcd*abcdef*", .str =3D "abcabcdabcdeabcdefg", .expected =3D= true }, + { .pat =3D "*abcd*", .str =3D "abcabcabcabcefg", .expected =3D false }, + { .pat =3D "*ab*cd*", .str =3D "abcabcabcabcefg", .expected =3D false }, +}; + +static void glob_case_to_desc(const struct glob_test_case *t, char *desc) +{ + snprintf(desc, KUNIT_PARAM_DESC_SIZE, "pat:\"%s\" str:\"%s\"", t->pat, t-= >str); +} + +KUNIT_ARRAY_PARAM(glob, glob_test_cases, glob_case_to_desc); + +static void glob_test_match(struct kunit *test) +{ + const struct glob_test_case *params =3D test->param_value; + + KUNIT_EXPECT_EQ_MSG(test, + glob_match(params->pat, params->str), + params->expected, + "Pattern: \"%s\", String: \"%s\", Expected: %d", + params->pat, params->str, params->expected); +} + +static struct kunit_case glob_kunit_test_cases[] =3D { + KUNIT_CASE_PARAM(glob_test_match, glob_gen_params), + {} +}; + +static struct kunit_suite glob_test_suite =3D { + .name =3D "glob", + .test_cases =3D glob_kunit_test_cases, +}; + +kunit_test_suite(glob_test_suite); +MODULE_DESCRIPTION("Test cases for glob functions"); +MODULE_LICENSE("Dual MIT/GPL"); diff --git a/lib/globtest.c b/lib/globtest.c deleted file mode 100644 index d8e97d43b..000000000 --- a/lib/globtest.c +++ /dev/null @@ -1,167 +0,0 @@ -/* - * Extracted fronm glob.c - */ - -#include -#include -#include -#include - -/* Boot with "glob.verbose=3D1" to show successful tests, too */ -static bool verbose =3D false; -module_param(verbose, bool, 0); - -struct glob_test { - char const *pat, *str; - bool expected; -}; - -static bool __pure __init test(char const *pat, char const *str, bool expe= cted) -{ - bool match =3D glob_match(pat, str); - bool success =3D match =3D=3D expected; - - /* Can't get string literals into a particular section, so... */ - static char const msg_error[] __initconst =3D - KERN_ERR "glob: \"%s\" vs. \"%s\": %s *** ERROR ***\n"; - static char const msg_ok[] __initconst =3D - KERN_DEBUG "glob: \"%s\" vs. \"%s\": %s OK\n"; - static char const mismatch[] __initconst =3D "mismatch"; - char const *message; - - if (!success) - message =3D msg_error; - else if (verbose) - message =3D msg_ok; - else - return success; - - printk(message, pat, str, mismatch + 3*match); - return success; -} - -/* - * The tests are all jammed together in one array to make it simpler - * to place that array in the .init.rodata section. The obvious - * "array of structures containing char *" has no way to force the - * pointed-to strings to be in a particular section. - * - * Anyway, a test consists of: - * 1. Expected glob_match result: '1' or '0'. - * 2. Pattern to match: null-terminated string - * 3. String to match against: null-terminated string - * - * The list of tests is terminated with a final '\0' instead of - * a glob_match result character. - */ -static char const glob_tests[] __initconst =3D - /* Some basic tests */ - "1" "a\0" "a\0" - "0" "a\0" "b\0" - "0" "a\0" "aa\0" - "0" "a\0" "\0" - "1" "\0" "\0" - "0" "\0" "a\0" - /* Simple character class tests */ - "1" "[a]\0" "a\0" - "0" "[a]\0" "b\0" - "0" "[!a]\0" "a\0" - "1" "[!a]\0" "b\0" - "1" "[ab]\0" "a\0" - "1" "[ab]\0" "b\0" - "0" "[ab]\0" "c\0" - "1" "[!ab]\0" "c\0" - "1" "[a-c]\0" "b\0" - "0" "[a-c]\0" "d\0" - /* Corner cases in character class parsing */ - "1" "[a-c-e-g]\0" "-\0" - "0" "[a-c-e-g]\0" "d\0" - "1" "[a-c-e-g]\0" "f\0" - "1" "[]a-ceg-ik[]\0" "a\0" - "1" "[]a-ceg-ik[]\0" "]\0" - "1" "[]a-ceg-ik[]\0" "[\0" - "1" "[]a-ceg-ik[]\0" "h\0" - "0" "[]a-ceg-ik[]\0" "f\0" - "0" "[!]a-ceg-ik[]\0" "h\0" - "0" "[!]a-ceg-ik[]\0" "]\0" - "1" "[!]a-ceg-ik[]\0" "f\0" - /* Simple wild cards */ - "1" "?\0" "a\0" - "0" "?\0" "aa\0" - "0" "??\0" "a\0" - "1" "?x?\0" "axb\0" - "0" "?x?\0" "abx\0" - "0" "?x?\0" "xab\0" - /* Asterisk wild cards (backtracking) */ - "0" "*??\0" "a\0" - "1" "*??\0" "ab\0" - "1" "*??\0" "abc\0" - "1" "*??\0" "abcd\0" - "0" "??*\0" "a\0" - "1" "??*\0" "ab\0" - "1" "??*\0" "abc\0" - "1" "??*\0" "abcd\0" - "0" "?*?\0" "a\0" - "1" "?*?\0" "ab\0" - "1" "?*?\0" "abc\0" - "1" "?*?\0" "abcd\0" - "1" "*b\0" "b\0" - "1" "*b\0" "ab\0" - "0" "*b\0" "ba\0" - "1" "*b\0" "bb\0" - "1" "*b\0" "abb\0" - "1" "*b\0" "bab\0" - "1" "*bc\0" "abbc\0" - "1" "*bc\0" "bc\0" - "1" "*bc\0" "bbc\0" - "1" "*bc\0" "bcbc\0" - /* Multiple asterisks (complex backtracking) */ - "1" "*ac*\0" "abacadaeafag\0" - "1" "*ac*ae*ag*\0" "abacadaeafag\0" - "1" "*a*b*[bc]*[ef]*g*\0" "abacadaeafag\0" - "0" "*a*b*[ef]*[cd]*g*\0" "abacadaeafag\0" - "1" "*abcd*\0" "abcabcabcabcdefg\0" - "1" "*ab*cd*\0" "abcabcabcabcdefg\0" - "1" "*abcd*abcdef*\0" "abcabcdabcdeabcdefg\0" - "0" "*abcd*\0" "abcabcabcabcefg\0" - "0" "*ab*cd*\0" "abcabcabcabcefg\0"; - -static int __init glob_init(void) -{ - unsigned successes =3D 0; - unsigned n =3D 0; - char const *p =3D glob_tests; - static char const message[] __initconst =3D - KERN_INFO "glob: %u self-tests passed, %u failed\n"; - - /* - * Tests are jammed together in a string. The first byte is '1' - * or '0' to indicate the expected outcome, or '\0' to indicate the - * end of the tests. Then come two null-terminated strings: the - * pattern and the string to match it against. - */ - while (*p) { - bool expected =3D *p++ & 1; - char const *pat =3D p; - - p +=3D strlen(p) + 1; - successes +=3D test(pat, p, expected); - p +=3D strlen(p) + 1; - n++; - } - - n -=3D successes; - printk(message, successes, n); - - /* What's the errno for "kernel bug detected"? Guess... */ - return n ? -ECANCELED : 0; -} - -/* We need a dummy exit function to allow unload */ -static void __exit glob_fini(void) { } - -module_init(glob_init); -module_exit(glob_fini); - -MODULE_DESCRIPTION("glob(7) matching tests"); -MODULE_LICENSE("Dual MIT/GPL"); --=20 2.52.0.351.gbe84eed79e-goog