archives/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-03-07 23:04:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

lib/glob: convert selftest to KUnit

Browse source 
This patch converts the existing glob selftest (lib/globtest.c) to use the
KUnit framework (lib/tests/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=y
CONFIG_GLOB_KUNIT_TEST=y

Link: https://lkml.kernel.org/r/20260108120753.27339-1-note351@hotmail.com
Signed-off-by: Kir Chou <note351@hotmail.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Reviewed-by: David Gow <davidgow@google.com>
Reviewed-by: Kuan-Wei Chiu <visitorckw@gmail.com>
Cc: <kirchou@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
This commit is contained in:
Kir Chou 2026-01-08 21:07:53 +09:00 • committed by Andrew Morton
parent 105ddfb2d2
commit bf45794244
18 changed files with 139 additions and 193 deletions
Download patch file Download diff file Expand all files Collapse all files

1
arch/m68k/configs/amiga_defconfig
View file

@ -600,7 +600,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
CONFIG_PRIME_NUMBERS=m
CONFIG_CRC_BENCHMARK=y
CONFIG_XZ_DEC_TEST=m
CONFIG_GLOB_SELFTEST=m
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
CONFIG_MAGIC_SYSRQ=y
CONFIG_TEST_LOCKUP=m

1
arch/m68k/configs/apollo_defconfig
View file

@ -557,7 +557,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
CONFIG_PRIME_NUMBERS=m
CONFIG_CRC_BENCHMARK=y
CONFIG_XZ_DEC_TEST=m
CONFIG_GLOB_SELFTEST=m
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
CONFIG_MAGIC_SYSRQ=y
CONFIG_TEST_LOCKUP=m

1
arch/m68k/configs/atari_defconfig
View file

@ -577,7 +577,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
CONFIG_PRIME_NUMBERS=m
CONFIG_CRC_BENCHMARK=y
CONFIG_XZ_DEC_TEST=m
CONFIG_GLOB_SELFTEST=m
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
CONFIG_MAGIC_SYSRQ=y
CONFIG_TEST_LOCKUP=m

1
arch/m68k/configs/bvme6000_defconfig
View file

@ -549,7 +549,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
CONFIG_PRIME_NUMBERS=m
CONFIG_CRC_BENCHMARK=y
CONFIG_XZ_DEC_TEST=m
CONFIG_GLOB_SELFTEST=m
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
CONFIG_MAGIC_SYSRQ=y
CONFIG_TEST_LOCKUP=m

1
arch/m68k/configs/hp300_defconfig
View file

@ -559,7 +559,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
CONFIG_PRIME_NUMBERS=m
CONFIG_CRC_BENCHMARK=y
CONFIG_XZ_DEC_TEST=m
CONFIG_GLOB_SELFTEST=m
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
CONFIG_MAGIC_SYSRQ=y
CONFIG_TEST_LOCKUP=m

1
arch/m68k/configs/mac_defconfig
View file

@ -576,7 +576,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
CONFIG_PRIME_NUMBERS=m
CONFIG_CRC_BENCHMARK=y
CONFIG_XZ_DEC_TEST=m
CONFIG_GLOB_SELFTEST=m
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
CONFIG_MAGIC_SYSRQ=y
CONFIG_TEST_LOCKUP=m

1
arch/m68k/configs/multi_defconfig
View file

@ -663,7 +663,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
CONFIG_PRIME_NUMBERS=m
CONFIG_CRC_BENCHMARK=y
CONFIG_XZ_DEC_TEST=m
CONFIG_GLOB_SELFTEST=m
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
CONFIG_MAGIC_SYSRQ=y
CONFIG_TEST_LOCKUP=m

1
arch/m68k/configs/mvme147_defconfig
View file

@ -549,7 +549,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
CONFIG_PRIME_NUMBERS=m
CONFIG_CRC_BENCHMARK=y
CONFIG_XZ_DEC_TEST=m
CONFIG_GLOB_SELFTEST=m
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
CONFIG_MAGIC_SYSRQ=y
CONFIG_TEST_LOCKUP=m

1
arch/m68k/configs/mvme16x_defconfig
View file

@ -550,7 +550,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
CONFIG_PRIME_NUMBERS=m
CONFIG_CRC_BENCHMARK=y
CONFIG_XZ_DEC_TEST=m
CONFIG_GLOB_SELFTEST=m
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
CONFIG_MAGIC_SYSRQ=y
CONFIG_TEST_LOCKUP=m

1
arch/m68k/configs/q40_defconfig
View file

@ -566,7 +566,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
CONFIG_PRIME_NUMBERS=m
CONFIG_CRC_BENCHMARK=y
CONFIG_XZ_DEC_TEST=m
CONFIG_GLOB_SELFTEST=m
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
CONFIG_MAGIC_SYSRQ=y
CONFIG_TEST_LOCKUP=m

1
arch/m68k/configs/sun3_defconfig
View file

@ -547,7 +547,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
CONFIG_PRIME_NUMBERS=m
CONFIG_CRC_BENCHMARK=y
CONFIG_XZ_DEC_TEST=m
CONFIG_GLOB_SELFTEST=m
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
CONFIG_MAGIC_SYSRQ=y
CONFIG_TEST_LOCKUP=m

1
arch/m68k/configs/sun3x_defconfig
View file

@ -547,7 +547,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
CONFIG_PRIME_NUMBERS=m
CONFIG_CRC_BENCHMARK=y
CONFIG_XZ_DEC_TEST=m
CONFIG_GLOB_SELFTEST=m
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
CONFIG_MAGIC_SYSRQ=y
CONFIG_TEST_LOCKUP=m

13
lib/Kconfig
View file

@ -430,19 +430,6 @@ config GLOB
are compiling an out-of tree driver which tells you that it
depends on this.
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
#

13
lib/Kconfig.debug
View file

@ -3364,6 +3364,19 @@ config PRIME_NUMBERS_KUNIT_TEST
If unsure, say N
config GLOB_KUNIT_TEST
tristate "Glob matching test" if !KUNIT_ALL_TESTS
depends on GLOB
depends on KUNIT
default KUNIT_ALL_TESTS
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
config ARCH_USE_MEMTEST

1
lib/Makefile
View file

@ -224,7 +224,6 @@ obj-$(CONFIG_CLOSURES) += closure.o
obj-$(CONFIG_DQL) += dynamic_queue_limits.o
obj-$(CONFIG_GLOB) += glob.o
obj-$(CONFIG_GLOB_SELFTEST) += globtest.o
obj-$(CONFIG_DIMLIB) += dim/
obj-$(CONFIG_SIGNATURE) += digsig.o

167
lib/globtest.c
View file

@ -1,167 +0,0 @@
/*
* Extracted fronm glob.c
*/
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/glob.h>
#include <linux/printk.h>
/* Boot with "glob.verbose=1" to show successful tests, too */
static bool verbose = 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 expected)
{
bool match = glob_match(pat, str);
bool success = match == expected;
/* Can't get string literals into a particular section, so... */
static char const msg_error[] __initconst =
KERN_ERR "glob: \"%s\" vs. \"%s\": %s *** ERROR ***\n";
static char const msg_ok[] __initconst =
KERN_DEBUG "glob: \"%s\" vs. \"%s\": %s OK\n";
static char const mismatch[] __initconst = "mismatch";
char const *message;
if (!success)
message = msg_error;
else if (verbose)
message = 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 =
/* 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 = 0;
unsigned n = 0;
char const *p = glob_tests;
static char const message[] __initconst =
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 = *p++ & 1;
char const *pat = p;
p += strlen(p) + 1;
successes += test(pat, p, expected);
p += strlen(p) + 1;
n++;
}
n -= 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");

1
lib/tests/Makefile
View file

@ -19,6 +19,7 @@ CFLAGS_fortify_kunit.o += $(DISABLE_STRUCTLEAK_PLUGIN)
obj-$(CONFIG_FORTIFY_KUNIT_TEST) += fortify_kunit.o
CFLAGS_test_fprobe.o += $(CC_FLAGS_FTRACE)
obj-$(CONFIG_FPROBE_SANITY_TEST) += test_fprobe.o
obj-$(CONFIG_GLOB_KUNIT_TEST) += glob_kunit.o
obj-$(CONFIG_HASHTABLE_KUNIT_TEST) += hashtable_test.o
obj-$(CONFIG_HASH_KUNIT_TEST) += test_hash.o
obj-$(CONFIG_TEST_IOV_ITER) += kunit_iov_iter.o

125
lib/tests/glob_kunit.c Normal file
View file

@ -0,0 +1,125 @@
// SPDX-License-Identifier: MIT OR GPL-2.0
/*
* Test cases for glob functions.
*/
#include <kunit/test.h>
#include <linux/glob.h>
#include <linux/module.h>
/**
* struct glob_test_case - Test case for glob matching.
* @pat: Pattern to match.
* @str: String to match against.
* @expected: Expected glob_match result, true if matched.
*/
struct glob_test_case {
const char *pat;
const char *str;
bool expected;
};
static const struct glob_test_case glob_test_cases[] = {
/* Some basic tests */
{ .pat = "a", .str = "a", .expected = true },
{ .pat = "a", .str = "b", .expected = false },
{ .pat = "a", .str = "aa", .expected = false },
{ .pat = "a", .str = "", .expected = false },
{ .pat = "", .str = "", .expected = true },
{ .pat = "", .str = "a", .expected = false },
/* Simple character class tests */
{ .pat = "[a]", .str = "a", .expected = true },
{ .pat = "[a]", .str = "b", .expected = false },
{ .pat = "[!a]", .str = "a", .expected = false },
{ .pat = "[!a]", .str = "b", .expected = true },
{ .pat = "[ab]", .str = "a", .expected = true },
{ .pat = "[ab]", .str = "b", .expected = true },
{ .pat = "[ab]", .str = "c", .expected = false },
{ .pat = "[!ab]", .str = "c", .expected = true },
{ .pat = "[a-c]", .str = "b", .expected = true },
{ .pat = "[a-c]", .str = "d", .expected = false },
/* Corner cases in character class parsing */
{ .pat = "[a-c-e-g]", .str = "-", .expected = true },
{ .pat = "[a-c-e-g]", .str = "d", .expected = false },
{ .pat = "[a-c-e-g]", .str = "f", .expected = true },
{ .pat = "[]a-ceg-ik[]", .str = "a", .expected = true },
{ .pat = "[]a-ceg-ik[]", .str = "]", .expected = true },
{ .pat = "[]a-ceg-ik[]", .str = "[", .expected = true },
{ .pat = "[]a-ceg-ik[]", .str = "h", .expected = true },
{ .pat = "[]a-ceg-ik[]", .str = "f", .expected = false },
{ .pat = "[!]a-ceg-ik[]", .str = "h", .expected = false },
{ .pat = "[!]a-ceg-ik[]", .str = "]", .expected = false },
{ .pat = "[!]a-ceg-ik[]", .str = "f", .expected = true },
/* Simple wild cards */
{ .pat = "?", .str = "a", .expected = true },
{ .pat = "?", .str = "aa", .expected = false },
{ .pat = "??", .str = "a", .expected = false },
{ .pat = "?x?", .str = "axb", .expected = true },
{ .pat = "?x?", .str = "abx", .expected = false },
{ .pat = "?x?", .str = "xab", .expected = false },
/* Asterisk wild cards (backtracking) */
{ .pat = "*??", .str = "a", .expected = false },
{ .pat = "*??", .str = "ab", .expected = true },
{ .pat = "*??", .str = "abc", .expected = true },
{ .pat = "*??", .str = "abcd", .expected = true },
{ .pat = "??*", .str = "a", .expected = false },
{ .pat = "??*", .str = "ab", .expected = true },
{ .pat = "??*", .str = "abc", .expected = true },
{ .pat = "??*", .str = "abcd", .expected = true },
{ .pat = "?*?", .str = "a", .expected = false },
{ .pat = "?*?", .str = "ab", .expected = true },
{ .pat = "?*?", .str = "abc", .expected = true },
{ .pat = "?*?", .str = "abcd", .expected = true },
{ .pat = "*b", .str = "b", .expected = true },
{ .pat = "*b", .str = "ab", .expected = true },
{ .pat = "*b", .str = "ba", .expected = false },
{ .pat = "*b", .str = "bb", .expected = true },
{ .pat = "*b", .str = "abb", .expected = true },
{ .pat = "*b", .str = "bab", .expected = true },
{ .pat = "*bc", .str = "abbc", .expected = true },
{ .pat = "*bc", .str = "bc", .expected = true },
{ .pat = "*bc", .str = "bbc", .expected = true },
{ .pat = "*bc", .str = "bcbc", .expected = true },
/* Multiple asterisks (complex backtracking) */
{ .pat = "*ac*", .str = "abacadaeafag", .expected = true },
{ .pat = "*ac*ae*ag*", .str = "abacadaeafag", .expected = true },
{ .pat = "*a*b*[bc]*[ef]*g*", .str = "abacadaeafag", .expected = true },
{ .pat = "*a*b*[ef]*[cd]*g*", .str = "abacadaeafag", .expected = false },
{ .pat = "*abcd*", .str = "abcabcabcabcdefg", .expected = true },
{ .pat = "*ab*cd*", .str = "abcabcabcabcdefg", .expected = true },
{ .pat = "*abcd*abcdef*", .str = "abcabcdabcdeabcdefg", .expected = true },
{ .pat = "*abcd*", .str = "abcabcabcabcefg", .expected = false },
{ .pat = "*ab*cd*", .str = "abcabcabcabcefg", .expected = 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 = 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[] = {
KUNIT_CASE_PARAM(glob_test_match, glob_gen_params),
{}
};
static struct kunit_suite glob_test_suite = {
.name = "glob",
.test_cases = glob_kunit_test_cases,
};
kunit_test_suite(glob_test_suite);
MODULE_DESCRIPTION("Test cases for glob functions");
MODULE_LICENSE("Dual MIT/GPL");