From nobody Thu Dec 18 03:57:05 2025 Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) (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 73E7E2E8E09 for ; Mon, 15 Dec 2025 13:45:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765806317; cv=none; b=Lu2WRhYQyGCa9LBO5t+DTfhhGMHot8Dkwv7onMmmtIEuWDON7s5QwEiC8QZos4meuHBixFIBG7Woqp7OOAQHxh3IlzftgaLMUmRBndMS3qokoktZksQCa/92dgrELejGpcbKDBJoBk28q1tj3IbxWip/nVKhf1RSMcdQPEVTYhc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1765806317; c=relaxed/simple; bh=l3URM21noucIi+vlIb+Tl+GF4cJRDQ+45M633MjmuxQ=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=S8v6njWRaafHcUFtX/iH/JQFciF1yUuCoJ1hcm8PvtCMhkwhnvYpmPwq0o7EXG0JTpBA1du+4ysFMhqJhriWOGx/AYcYKjJyCk6P2I8O1/ca11As1uVmXxq2/+a9xSDDr2SYPgXkWpD72hXJZto/bim94B5um3Su4DUkhekxErU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=ZnIewHAK; arc=none smtp.client-ip=209.85.210.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.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="ZnIewHAK" Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-7aa9be9f03aso2751842b3a.2 for ; Mon, 15 Dec 2025 05:45:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1765806315; x=1766411115; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=YB/SACY0hrHioM+utoBsAFWi3wvv2dgN+THjHaphqOQ=; b=ZnIewHAK+fVYtWbBBggVQiiAlOVwJHYUY94ahFn8T9dWp/7k4brZF71XtX+ILbZQFU Xv6To80UkrabmddbYfzW21neOQEJJRbTPwYAdEzJJILXdkTwTFwrDPYcpqG2XIUYFLV3 wEISRNwZZeMjt54yHZ8+ww2fCVVQ/gpL3/oZflUbdIl2BYP/zUe4ir6gtUs7hNVMOook 9OasM+/fXofMpzki4EJ3TKUmbZAKxNaTzPg6d915r8ir/TMnn/ffVVC2mxBZWH+aCCBO w249iBUQfdbsa5drQddV7rRVcA7Hd2U9dMjI1BtIqmdmnkE6CCy3kks++sPLFfGvetwJ TVnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1765806315; x=1766411115; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=YB/SACY0hrHioM+utoBsAFWi3wvv2dgN+THjHaphqOQ=; b=aoH/hfjI4JobMAGF+5DQbF6CRnqV/ExG4MCU3TA4oml9hmN5zeDqr9TxTBQ3CACCrS z+2lJhfq7PwAj1bBdDTJmN5PrwfLuPNMyNbGMCsIEKS9n6C3ymKs+THXoLrba/HoMeMx 423QK3CdRm7bureXWed0NT0dFKyCT57BjSs7E8ncoJbyDMQkQO+9h1BbtPNZu+WM9lBz aQvXQG9XUV1soUiei9Lx1z2zx5h5MjJ0nlOE8phSF5m1qVSiaAMEpmE+lINwU47tdsz3 6GbkuX891fF9yJCEoMY77rLVE0Czhp/kHZ1zpMMYuifMoq9cNai+jyPns4QQd/ydyZja SMuw== X-Forwarded-Encrypted: i=1; AJvYcCV3o9kkjf/1ZmWzFbRLoy3xRt3o4tqAPY/gnA9NsQ+PfOVZbKBB2+seGh+V0mogGhYAqwPTKI42kwF4mK4=@vger.kernel.org X-Gm-Message-State: AOJu0YyMhGP2TLSCG59bnWb72nriF4prgt5DvpGUJ8tZwPtX+caSeUvR PPE1hnBa/4hKiqzHoY27RuyObU29J2w+S/c5isMcCz1bhUYOvoDlToQy X-Gm-Gg: AY/fxX4/yTHH0RtlPddn3dOxmVNJ3gDT/HWDbQexWc1Q9WtOziR5iyCUNS5k4hRvaRf u+cPGHM8a1lh6YZcU9vU/hzK9zaKW3AxAPcxzcms7Jw+l7wtuQmQKNcM2novS9EK5M4uyjbMtlm 4qgYjF++U8ODl1jAoxdfnUpH0+REpL2lBSyZyNQB4wF/owFGLeXyWwlRZ78FPwC2IPKBO4wLFgO haiEO0APsmCwxkqJIxo1ipL02I7NUK/v0znqzFBRtY7qFai97i69EvLOCgG3yWuh7+2/m1LdB++ fN2o+LZ+UfAjR18CEDh5WR9vYjSuZoEf6USTLm7RV9CgA9h47Rfjx2KkgoN4E/qoSFUzwBH4kr8 mN7EJSlaGkWq+O3GG7UevGs5GBq/xHYD3DLykn86UtLqQWA4Hxp7rIDuuhNC6OdVHPrkMbGpopX AEOc17YxoJErOgH29EgDq5BH3HCHXND/ay2wsfpA== X-Google-Smtp-Source: AGHT+IFbkg5VzAQhUZgMJl3N6xiJRl9VChZWLfC4EwUXCmNN1/sGt5d/uipwzS+XziVPW9c9YX7Fnw== X-Received: by 2002:a05:6a00:1990:b0:7f7:1819:1982 with SMTP id d2e1a72fcca58-7f718191e80mr9169935b3a.22.1765806314213; Mon, 15 Dec 2025 05:45:14 -0800 (PST) Received: from localhost.localdomain ([210.228.119.9]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7f4c53834a7sm12684057b3a.55.2025.12.15.05.45.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Dec 2025 05:45:13 -0800 (PST) From: Ryota Sakamoto To: Andrew Morton Cc: Andy Shevchenko , David Gow , Geert Uytterhoeven , linux-kernel@vger.kernel.org, Ryota Sakamoto Subject: [PATCH v2] lib/tests: Convert test_uuid module to KUnit Date: Mon, 15 Dec 2025 13:43:22 +0000 Message-Id: <20251215134322.12949-1-sakamo.ryota@gmail.com> X-Mailer: git-send-email 2.34.1 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" Move lib/test_uuid.c to lib/tests/uuid_kunit.c and convert it to use KUnit. This change switches the ad-hoc test code to standard KUnit test cases. The test data remains the same, but the verification logic is updated to use KUNIT_EXPECT_* macros. Also remove CONFIG_TEST_UUID from arch/*/configs/* because it is no longer used. The new CONFIG_UUID_KUNIT_TEST will be automatically enabled by CONFIG_KUNIT_ALL_TESTS. Signed-off-by: Ryota Sakamoto Acked-by: Geert Uytterhoeven Reviewed-by: David Gow --- v2: - Remove unused TEST_UUID config option from lib/Kconfig.debug - Update commit message to clarify why the old config is removed - Collect Acked-by tag from 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 - arch/powerpc/configs/ppc64_defconfig | 1 - lib/Kconfig.debug | 14 ++- lib/Makefile | 1 - lib/test_uuid.c | 134 --------------------------- lib/tests/Makefile | 1 + lib/tests/uuid_kunit.c | 106 +++++++++++++++++++++ 18 files changed, 118 insertions(+), 151 deletions(-) delete mode 100644 lib/test_uuid.c create mode 100644 lib/tests/uuid_kunit.c diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_de= fconfig index bfc1ee7c8158..1439abb69f73 100644 --- a/arch/m68k/configs/amiga_defconfig +++ b/arch/m68k/configs/amiga_defconfig @@ -618,7 +618,6 @@ CONFIG_ASYNC_RAID6_TEST=3Dm CONFIG_TEST_HEXDUMP=3Dm CONFIG_TEST_KSTRTOX=3Dm CONFIG_TEST_BITMAP=3Dm -CONFIG_TEST_UUID=3Dm CONFIG_TEST_XARRAY=3Dm CONFIG_TEST_MAPLE_TREE=3Dm CONFIG_TEST_RHASHTABLE=3Dm diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_= defconfig index d9d1f3c4c70d..6a4e71866f60 100644 --- a/arch/m68k/configs/apollo_defconfig +++ b/arch/m68k/configs/apollo_defconfig @@ -575,7 +575,6 @@ CONFIG_ASYNC_RAID6_TEST=3Dm CONFIG_TEST_HEXDUMP=3Dm CONFIG_TEST_KSTRTOX=3Dm CONFIG_TEST_BITMAP=3Dm -CONFIG_TEST_UUID=3Dm CONFIG_TEST_XARRAY=3Dm CONFIG_TEST_MAPLE_TREE=3Dm CONFIG_TEST_RHASHTABLE=3Dm diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_de= fconfig index 523205adccc8..46ad7d57b4fc 100644 --- a/arch/m68k/configs/atari_defconfig +++ b/arch/m68k/configs/atari_defconfig @@ -595,7 +595,6 @@ CONFIG_ASYNC_RAID6_TEST=3Dm CONFIG_TEST_HEXDUMP=3Dm CONFIG_TEST_KSTRTOX=3Dm CONFIG_TEST_BITMAP=3Dm -CONFIG_TEST_UUID=3Dm CONFIG_TEST_XARRAY=3Dm CONFIG_TEST_MAPLE_TREE=3Dm CONFIG_TEST_RHASHTABLE=3Dm diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6= 000_defconfig index 7b0a4ef0b010..867bfa13a44c 100644 --- a/arch/m68k/configs/bvme6000_defconfig +++ b/arch/m68k/configs/bvme6000_defconfig @@ -567,7 +567,6 @@ CONFIG_ASYNC_RAID6_TEST=3Dm CONFIG_TEST_HEXDUMP=3Dm CONFIG_TEST_KSTRTOX=3Dm CONFIG_TEST_BITMAP=3Dm -CONFIG_TEST_UUID=3Dm CONFIG_TEST_XARRAY=3Dm CONFIG_TEST_MAPLE_TREE=3Dm CONFIG_TEST_RHASHTABLE=3Dm diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_de= fconfig index 089c5c394c62..5dfe602cafd4 100644 --- a/arch/m68k/configs/hp300_defconfig +++ b/arch/m68k/configs/hp300_defconfig @@ -577,7 +577,6 @@ CONFIG_ASYNC_RAID6_TEST=3Dm CONFIG_TEST_HEXDUMP=3Dm CONFIG_TEST_KSTRTOX=3Dm CONFIG_TEST_BITMAP=3Dm -CONFIG_TEST_UUID=3Dm CONFIG_TEST_XARRAY=3Dm CONFIG_TEST_MAPLE_TREE=3Dm CONFIG_TEST_RHASHTABLE=3Dm diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defcon= fig index 5f2484c36733..f5d30310a349 100644 --- a/arch/m68k/configs/mac_defconfig +++ b/arch/m68k/configs/mac_defconfig @@ -594,7 +594,6 @@ CONFIG_ASYNC_RAID6_TEST=3Dm CONFIG_TEST_HEXDUMP=3Dm CONFIG_TEST_KSTRTOX=3Dm CONFIG_TEST_BITMAP=3Dm -CONFIG_TEST_UUID=3Dm CONFIG_TEST_XARRAY=3Dm CONFIG_TEST_MAPLE_TREE=3Dm CONFIG_TEST_RHASHTABLE=3Dm diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_de= fconfig index 74f0a1f6d871..fe54e9222cc0 100644 --- a/arch/m68k/configs/multi_defconfig +++ b/arch/m68k/configs/multi_defconfig @@ -681,7 +681,6 @@ CONFIG_ASYNC_RAID6_TEST=3Dm CONFIG_TEST_HEXDUMP=3Dm CONFIG_TEST_KSTRTOX=3Dm CONFIG_TEST_BITMAP=3Dm -CONFIG_TEST_UUID=3Dm CONFIG_TEST_XARRAY=3Dm CONFIG_TEST_MAPLE_TREE=3Dm CONFIG_TEST_RHASHTABLE=3Dm diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme14= 7_defconfig index 4bee18c820e4..4ff2ff0993ad 100644 --- a/arch/m68k/configs/mvme147_defconfig +++ b/arch/m68k/configs/mvme147_defconfig @@ -567,7 +567,6 @@ CONFIG_ASYNC_RAID6_TEST=3Dm CONFIG_TEST_HEXDUMP=3Dm CONFIG_TEST_KSTRTOX=3Dm CONFIG_TEST_BITMAP=3Dm -CONFIG_TEST_UUID=3Dm CONFIG_TEST_XARRAY=3Dm CONFIG_TEST_MAPLE_TREE=3Dm CONFIG_TEST_RHASHTABLE=3Dm diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16= x_defconfig index 322c17e55c9a..6bb4738a65aa 100644 --- a/arch/m68k/configs/mvme16x_defconfig +++ b/arch/m68k/configs/mvme16x_defconfig @@ -568,7 +568,6 @@ CONFIG_ASYNC_RAID6_TEST=3Dm CONFIG_TEST_HEXDUMP=3Dm CONFIG_TEST_KSTRTOX=3Dm CONFIG_TEST_BITMAP=3Dm -CONFIG_TEST_UUID=3Dm CONFIG_TEST_XARRAY=3Dm CONFIG_TEST_MAPLE_TREE=3Dm CONFIG_TEST_RHASHTABLE=3Dm diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defcon= fig index 82f9baab8fea..14166c8fe234 100644 --- a/arch/m68k/configs/q40_defconfig +++ b/arch/m68k/configs/q40_defconfig @@ -584,7 +584,6 @@ CONFIG_ASYNC_RAID6_TEST=3Dm CONFIG_TEST_HEXDUMP=3Dm CONFIG_TEST_KSTRTOX=3Dm CONFIG_TEST_BITMAP=3Dm -CONFIG_TEST_UUID=3Dm CONFIG_TEST_XARRAY=3Dm CONFIG_TEST_MAPLE_TREE=3Dm CONFIG_TEST_RHASHTABLE=3Dm diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defc= onfig index f94ad226cb5b..5db924e3caf7 100644 --- a/arch/m68k/configs/sun3_defconfig +++ b/arch/m68k/configs/sun3_defconfig @@ -564,7 +564,6 @@ CONFIG_ASYNC_RAID6_TEST=3Dm CONFIG_TEST_HEXDUMP=3Dm CONFIG_TEST_KSTRTOX=3Dm CONFIG_TEST_BITMAP=3Dm -CONFIG_TEST_UUID=3Dm CONFIG_TEST_XARRAY=3Dm CONFIG_TEST_MAPLE_TREE=3Dm CONFIG_TEST_RHASHTABLE=3Dm diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_de= fconfig index a5ecfc505ab2..318c9fe42f46 100644 --- a/arch/m68k/configs/sun3x_defconfig +++ b/arch/m68k/configs/sun3x_defconfig @@ -565,7 +565,6 @@ CONFIG_ASYNC_RAID6_TEST=3Dm CONFIG_TEST_HEXDUMP=3Dm CONFIG_TEST_KSTRTOX=3Dm CONFIG_TEST_BITMAP=3Dm -CONFIG_TEST_UUID=3Dm CONFIG_TEST_XARRAY=3Dm CONFIG_TEST_MAPLE_TREE=3Dm CONFIG_TEST_RHASHTABLE=3Dm diff --git a/arch/powerpc/configs/ppc64_defconfig b/arch/powerpc/configs/pp= c64_defconfig index 2d92c11eea7e..684b3ea80f39 100644 --- a/arch/powerpc/configs/ppc64_defconfig +++ b/arch/powerpc/configs/ppc64_defconfig @@ -443,7 +443,6 @@ CONFIG_TEST_KSTRTOX=3Dm CONFIG_TEST_PRINTF=3Dm CONFIG_TEST_SCANF=3Dm CONFIG_TEST_BITMAP=3Dm -CONFIG_TEST_UUID=3Dm CONFIG_TEST_XARRAY=3Dm CONFIG_TEST_MAPLE_TREE=3Dm CONFIG_TEST_RHASHTABLE=3Dm diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index ba36939fda79..4bfca37f313e 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug @@ -2499,9 +2499,6 @@ config TEST_BITMAP =20 If unsure, say N. =20 -config TEST_UUID - tristate "Test functions located in the uuid module at runtime" - config TEST_XARRAY tristate "Test the XArray code at runtime" =20 @@ -3285,6 +3282,17 @@ config RATELIMIT_KUNIT_TEST =20 If unsure, say N. =20 +config UUID_KUNIT_TEST + tristate "KUnit test for UUID" if !KUNIT_ALL_TESTS + depends on KUNIT + default KUNIT_ALL_TESTS + help + This option enables the KUnit test suite for the uuid library, + which provides functions for generating and parsing UUID and GUID. + The test suite checks parsing of UUID and GUID strings. + + If unsure, say N. + config INT_POW_KUNIT_TEST tristate "Integer exponentiation (int_pow) test" if !KUNIT_ALL_TESTS depends on KUNIT diff --git a/lib/Makefile b/lib/Makefile index aaf677cf4527..586a9f9b27a9 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -89,7 +89,6 @@ ifeq ($(CONFIG_CC_IS_CLANG)$(CONFIG_KASAN),yy) GCOV_PROFILE_test_bitmap.o :=3D n endif =20 -obj-$(CONFIG_TEST_UUID) +=3D test_uuid.o obj-$(CONFIG_TEST_XARRAY) +=3D test_xarray.o obj-$(CONFIG_TEST_MAPLE_TREE) +=3D test_maple_tree.o obj-$(CONFIG_TEST_PARMAN) +=3D test_parman.o diff --git a/lib/test_uuid.c b/lib/test_uuid.c deleted file mode 100644 index 0124fad5d72c..000000000000 --- a/lib/test_uuid.c +++ /dev/null @@ -1,134 +0,0 @@ -/* - * Test cases for lib/uuid.c module. - */ -#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt - -#include -#include -#include -#include -#include - -struct test_uuid_data { - const char *uuid; - guid_t le; - uuid_t be; -}; - -static const struct test_uuid_data test_uuid_test_data[] =3D { - { - .uuid =3D "c33f4995-3701-450e-9fbf-206a2e98e576", - .le =3D GUID_INIT(0xc33f4995, 0x3701, 0x450e, 0x9f, 0xbf, 0x20, 0x6a, 0x= 2e, 0x98, 0xe5, 0x76), - .be =3D UUID_INIT(0xc33f4995, 0x3701, 0x450e, 0x9f, 0xbf, 0x20, 0x6a, 0x= 2e, 0x98, 0xe5, 0x76), - }, - { - .uuid =3D "64b4371c-77c1-48f9-8221-29f054fc023b", - .le =3D GUID_INIT(0x64b4371c, 0x77c1, 0x48f9, 0x82, 0x21, 0x29, 0xf0, 0x= 54, 0xfc, 0x02, 0x3b), - .be =3D UUID_INIT(0x64b4371c, 0x77c1, 0x48f9, 0x82, 0x21, 0x29, 0xf0, 0x= 54, 0xfc, 0x02, 0x3b), - }, - { - .uuid =3D "0cb4ddff-a545-4401-9d06-688af53e7f84", - .le =3D GUID_INIT(0x0cb4ddff, 0xa545, 0x4401, 0x9d, 0x06, 0x68, 0x8a, 0x= f5, 0x3e, 0x7f, 0x84), - .be =3D UUID_INIT(0x0cb4ddff, 0xa545, 0x4401, 0x9d, 0x06, 0x68, 0x8a, 0x= f5, 0x3e, 0x7f, 0x84), - }, -}; - -static const char * const test_uuid_wrong_data[] =3D { - "c33f4995-3701-450e-9fbf206a2e98e576 ", /* no hyphen(s) */ - "64b4371c-77c1-48f9-8221-29f054XX023b", /* invalid character(s) */ - "0cb4ddff-a545-4401-9d06-688af53e", /* not enough data */ -}; - -static unsigned total_tests __initdata; -static unsigned failed_tests __initdata; - -static void __init test_uuid_failed(const char *prefix, bool wrong, bool b= e, - const char *data, const char *actual) -{ - pr_err("%s test #%u %s %s data: '%s'\n", - prefix, - total_tests, - wrong ? "passed on wrong" : "failed on", - be ? "BE" : "LE", - data); - if (actual && *actual) - pr_err("%s test #%u actual data: '%s'\n", - prefix, - total_tests, - actual); - failed_tests++; -} - -static void __init test_uuid_test(const struct test_uuid_data *data) -{ - guid_t le; - uuid_t be; - char buf[48]; - - /* LE */ - total_tests++; - if (guid_parse(data->uuid, &le)) - test_uuid_failed("conversion", false, false, data->uuid, NULL); - - total_tests++; - if (!guid_equal(&data->le, &le)) { - sprintf(buf, "%pUl", &le); - test_uuid_failed("cmp", false, false, data->uuid, buf); - } - - /* BE */ - total_tests++; - if (uuid_parse(data->uuid, &be)) - test_uuid_failed("conversion", false, true, data->uuid, NULL); - - total_tests++; - if (!uuid_equal(&data->be, &be)) { - sprintf(buf, "%pUb", &be); - test_uuid_failed("cmp", false, true, data->uuid, buf); - } -} - -static void __init test_uuid_wrong(const char *data) -{ - guid_t le; - uuid_t be; - - /* LE */ - total_tests++; - if (!guid_parse(data, &le)) - test_uuid_failed("negative", true, false, data, NULL); - - /* BE */ - total_tests++; - if (!uuid_parse(data, &be)) - test_uuid_failed("negative", true, true, data, NULL); -} - -static int __init test_uuid_init(void) -{ - unsigned int i; - - for (i =3D 0; i < ARRAY_SIZE(test_uuid_test_data); i++) - test_uuid_test(&test_uuid_test_data[i]); - - for (i =3D 0; i < ARRAY_SIZE(test_uuid_wrong_data); i++) - test_uuid_wrong(test_uuid_wrong_data[i]); - - if (failed_tests =3D=3D 0) - pr_info("all %u tests passed\n", total_tests); - else - pr_err("failed %u out of %u tests\n", failed_tests, total_tests); - - return failed_tests ? -EINVAL : 0; -} -module_init(test_uuid_init); - -static void __exit test_uuid_exit(void) -{ - /* do nothing */ -} -module_exit(test_uuid_exit); - -MODULE_AUTHOR("Andy Shevchenko "); -MODULE_DESCRIPTION("Test cases for lib/uuid.c module"); -MODULE_LICENSE("Dual BSD/GPL"); diff --git a/lib/tests/Makefile b/lib/tests/Makefile index 601dba4b7d96..9a20608f65f5 100644 --- a/lib/tests/Makefile +++ b/lib/tests/Makefile @@ -49,5 +49,6 @@ obj-$(CONFIG_STRING_HELPERS_KUNIT_TEST) +=3D string_helpe= rs_kunit.o obj-$(CONFIG_USERCOPY_KUNIT_TEST) +=3D usercopy_kunit.o obj-$(CONFIG_UTIL_MACROS_KUNIT) +=3D util_macros_kunit.o obj-$(CONFIG_RATELIMIT_KUNIT_TEST) +=3D test_ratelimit.o +obj-$(CONFIG_UUID_KUNIT_TEST) +=3D uuid_kunit.o =20 obj-$(CONFIG_TEST_RUNTIME_MODULE) +=3D module/ diff --git a/lib/tests/uuid_kunit.c b/lib/tests/uuid_kunit.c new file mode 100644 index 000000000000..de71b2649dac --- /dev/null +++ b/lib/tests/uuid_kunit.c @@ -0,0 +1,106 @@ +// SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0 +/* + * Test cases for lib/uuid.c module. + */ + +#include +#include + +struct test_uuid_data { + const char *uuid; + guid_t le; + uuid_t be; +}; + +static const struct test_uuid_data test_uuid_test_data[] =3D { + { + .uuid =3D "c33f4995-3701-450e-9fbf-206a2e98e576", + .le =3D GUID_INIT(0xc33f4995, 0x3701, 0x450e, 0x9f, 0xbf, 0x20, 0x6a, 0x= 2e, 0x98, 0xe5, 0x76), + .be =3D UUID_INIT(0xc33f4995, 0x3701, 0x450e, 0x9f, 0xbf, 0x20, 0x6a, 0x= 2e, 0x98, 0xe5, 0x76), + }, + { + .uuid =3D "64b4371c-77c1-48f9-8221-29f054fc023b", + .le =3D GUID_INIT(0x64b4371c, 0x77c1, 0x48f9, 0x82, 0x21, 0x29, 0xf0, 0x= 54, 0xfc, 0x02, 0x3b), + .be =3D UUID_INIT(0x64b4371c, 0x77c1, 0x48f9, 0x82, 0x21, 0x29, 0xf0, 0x= 54, 0xfc, 0x02, 0x3b), + }, + { + .uuid =3D "0cb4ddff-a545-4401-9d06-688af53e7f84", + .le =3D GUID_INIT(0x0cb4ddff, 0xa545, 0x4401, 0x9d, 0x06, 0x68, 0x8a, 0x= f5, 0x3e, 0x7f, 0x84), + .be =3D UUID_INIT(0x0cb4ddff, 0xa545, 0x4401, 0x9d, 0x06, 0x68, 0x8a, 0x= f5, 0x3e, 0x7f, 0x84), + }, +}; + +static const char * const test_uuid_wrong_data[] =3D { + "c33f4995-3701-450e-9fbf206a2e98e576 ", /* no hyphen(s) */ + "64b4371c-77c1-48f9-8221-29f054XX023b", /* invalid character(s) */ + "0cb4ddff-a545-4401-9d06-688af53e", /* not enough data */ +}; + +static void uuid_test_guid_valid(struct kunit *test) +{ + unsigned int i; + const struct test_uuid_data *data; + guid_t le; + + for (i =3D 0; i < ARRAY_SIZE(test_uuid_test_data); i++) { + data =3D &test_uuid_test_data[i]; + KUNIT_EXPECT_EQ(test, guid_parse(data->uuid, &le), 0); + KUNIT_EXPECT_TRUE(test, guid_equal(&data->le, &le)); + } +} + +static void uuid_test_uuid_valid(struct kunit *test) +{ + unsigned int i; + const struct test_uuid_data *data; + uuid_t be; + + for (i =3D 0; i < ARRAY_SIZE(test_uuid_test_data); i++) { + data =3D &test_uuid_test_data[i]; + KUNIT_EXPECT_EQ(test, uuid_parse(data->uuid, &be), 0); + KUNIT_EXPECT_TRUE(test, uuid_equal(&data->be, &be)); + } +} + +static void uuid_test_guid_invalid(struct kunit *test) +{ + unsigned int i; + const char *uuid; + guid_t le; + + for (i =3D 0; i < ARRAY_SIZE(test_uuid_wrong_data); i++) { + uuid =3D test_uuid_wrong_data[i]; + KUNIT_EXPECT_EQ(test, guid_parse(uuid, &le), -EINVAL); + } +} + +static void uuid_test_uuid_invalid(struct kunit *test) +{ + unsigned int i; + const char *uuid; + uuid_t be; + + for (i =3D 0; i < ARRAY_SIZE(test_uuid_wrong_data); i++) { + uuid =3D test_uuid_wrong_data[i]; + KUNIT_EXPECT_EQ(test, uuid_parse(uuid, &be), -EINVAL); + } +} + +static struct kunit_case uuid_test_cases[] =3D { + KUNIT_CASE(uuid_test_guid_valid), + KUNIT_CASE(uuid_test_uuid_valid), + KUNIT_CASE(uuid_test_guid_invalid), + KUNIT_CASE(uuid_test_uuid_invalid), + {}, +}; + +static struct kunit_suite uuid_test_suite =3D { + .name =3D "uuid", + .test_cases =3D uuid_test_cases, +}; + +kunit_test_suite(uuid_test_suite); + +MODULE_AUTHOR("Andy Shevchenko "); +MODULE_DESCRIPTION("Test cases for lib/uuid.c module"); +MODULE_LICENSE("Dual BSD/GPL"); --=20 2.34.1