From nobody Sat Sep 26 09:19:21 2026 Received: from LO2P265CU024.outbound.protection.outlook.com (mail-uksouthazon11021138.outbound.protection.outlook.com [52.101.95.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 22266429036; Wed, 2 Sep 2026 22:00:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.95.138 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788386421; cv=fail; b=EvH0vL+H/j3hLXWrFjfgta/IRWNEe/AVeMqoOGrIU3yMEby1EpB1wDKE0+qscshBMlOJHdVhLoefJDOr7R4GaF0FOJE1KvTGbl0qHOcimxxUt4osaWkj+faFlDTeNRlokh0678VgN1PiIBVfHLUn0hOSaN7U1oDlfSPcfKwECVo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788386421; c=relaxed/simple; bh=8Slr4JijMhVs64weEWULVVojV11iIbJ8CnT0c4KGDtY=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=gu0FsMB6rLAnbr4BX2E8a6XpanLeWyl4ZEk31tmdK8+CE5fnPuZVIWVH4eH7XNOPL4oZSGPSpOxWmoJm7oEkCe5PToT9bPMBCBvBJvsC4ygSlSGxtTHQiVdrur/uMoX7aFIF6skK/YRnMF1V4A4t09LbgYuD3tDSSggjA11FB+0= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=garyguo.net; spf=pass smtp.mailfrom=garyguo.net; dkim=pass (1024-bit key) header.d=garyguo.net header.i=@garyguo.net header.b=rF3PLawN; arc=fail smtp.client-ip=52.101.95.138 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=garyguo.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=garyguo.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=garyguo.net header.i=@garyguo.net header.b="rF3PLawN" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=CfdN70TkWxUrI3jBRabfWYOsqcFVfrqPvR9R6dXUYX9Qs7hC/rTG2eAR8oWpFXOaGpXcvb9VJPEeyExNComt3tOcheardqzBp0f9uy8p6UqDAsgSnLJsCA8ycaIFDdKPSeCz/mrkHcS0OAFWVX1SYtdETYXfJY/3ZpWcCP+d0u0/UCvJOg5bPDB+pXGGrybi4aHAPK3PPNFWG1kLM9tLdxzp/41r6TlLMSFLhm51usMbnIrxiKsA3sQuFuq/WleOD8QC3Gq017Y2X4qNXzgh0JsubzyCpY27Li+EexyAUxL48TtJ+TEf5Q32GJin7r8JZT7x6gg7kJ3K09UG9gSZIQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=QIc0C64sBLtqyNnHxTNg0cQbWNuvM+p8ZEhRoWkw3AA=; b=J9bZA9kTkChuYIFHRY5cIxoFLxdVa2uaS8M3Vq7g0PYi49ULEv+J2NetoQnSlsrzWrdFT/+9+KCmmOcaXdSZEYq8vw9PyaaStKa+aoM4MT55BWaMOwMKa6F/rY0KMEMNUCi11ibAiKYRcN1kg1F9WUyaTJY5TaG6I2ChVj5mTtajtxlMnPlfmgRDlhhcrituv6EijYWOMJv8ijKX6d0a0r2Dm7rcVAarTJnyYFHnCM0uVk2eZRbW6kNth0955j7BneXg+4wHpj8bS80X2Fuw4bdPLwYPmxBgpllrR5PsdXU1z+SQBq5Tcy5a/Wi32Jw7BzkvNDUF5ivCQXAWCDuDrQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=garyguo.net; dmarc=pass action=none header.from=garyguo.net; dkim=pass header.d=garyguo.net; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=garyguo.net; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=QIc0C64sBLtqyNnHxTNg0cQbWNuvM+p8ZEhRoWkw3AA=; b=rF3PLawNiErEoJ0qn5QdALRUcgM6As0nl8wcLWhVvmi12d/4ck4NsKQJNXvrxTnkEhDDn1DfvCg5BARXP3yrO+2HO2g9Dk9RbLypgZJC7CARzY/qNijWhwdfgYs3siA5lHfaDJtZ41dAlnKPFr9V9mg7g2Cr8qZRSRAVfkxKPl4= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=garyguo.net; Received: from LOAP265MB8560.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:4ab::19) by CWXP265MB2773.GBRP265.PROD.OUTLOOK.COM (2603:10a6:400:aa::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.360.13; Wed, 2 Sep 2026 22:00:09 +0000 Received: from LOAP265MB8560.GBRP265.PROD.OUTLOOK.COM ([fe80::f60b:1537:68d7:4fc1]) by LOAP265MB8560.GBRP265.PROD.OUTLOOK.COM ([fe80::f60b:1537:68d7:4fc1%4]) with mapi id 15.21.0360.008; Wed, 2 Sep 2026 22:00:10 +0000 From: Gary Guo Date: Wed, 02 Sep 2026 22:59:59 +0100 Subject: [PATCH v2 1/3] rust: kunit: use `file!()` inside `kunit_assert!` Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260902-kunit-v2-1-eda3ed6c00c5@garyguo.net> References: <20260902-kunit-v2-0-eda3ed6c00c5@garyguo.net> In-Reply-To: <20260902-kunit-v2-0-eda3ed6c00c5@garyguo.net> To: Miguel Ojeda , Boqun Feng , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Daniel Almeida , Tamir Duberstein , Alexandre Courbot , =?utf-8?q?Onur_=C3=96zkan?= , Brendan Higgins , David Gow , Rae Moar Cc: rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, Gary Guo X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1788386408; l=7329; i=gary@garyguo.net; s=20221204; h=from:subject:message-id; bh=8Slr4JijMhVs64weEWULVVojV11iIbJ8CnT0c4KGDtY=; b=VolaeTHwsmv4jeuwkXBgYLxbK4CFlQJRjwa62ZXsHb9ur0Wf5G+c3z2eKS1p8n7G0upXpxvJW 5AjoGU1+YXyAuNvMSfwCNazd1eORtVElx53b8L7ufhQIDmc1txe/AzJ X-Developer-Key: i=gary@garyguo.net; a=ed25519; pk=vB3uIX95SM4eVrIqo1DWNWKDKD2xzB+yLLLr0yOPYMo= X-ClientProxiedBy: CWLP265CA0322.GBRP265.PROD.OUTLOOK.COM (2603:10a6:401:57::22) To LOAP265MB8560.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:4ab::19) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: LOAP265MB8560:EE_|CWXP265MB2773:EE_ X-MS-Office365-Filtering-Correlation-Id: 453612f0-3aa5-4cc0-d627-08df093d8e84 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|23010399003|7416014|10070799003|366016|56012099006|921020|5023799004|10067099003|22082099003|18002099003|3023799007; X-Microsoft-Antispam-Message-Info: YIudVQNvDQUnXwcFy4HB2HvUiN+kdm4pvyJ14j8CvoDYrgrngZcWAeIIlddY7J8Mgp24ZlaHFk8aluxpY3W63UWkYF360iDR8XF7cDFV3oeA8O0vaNn3l3gbUQMWWh+VASr9S/BsEJT7G3bMofZyw7M2m6B5XLaasPPO448upooCyHpplvKRFOh0yp9xZY7oJaUCYSCmavsGtYMvEUxKZFeTe+q6ixbje15Ib7qxM+lGjtANMeN2j+RKW++4medk8w8ISBNUCdt2HhpQlIas9SyVIjOy2q6+K++6zsbBVPQNAIeBTRr5PuBGi/6XRql6+0RDuWcFH3krd79syEco5M1vyzdeJEm12KHTAKEicZRjfKM2JJJ01BKc77ouiA1uRFlob7vJnHV+50oSsoK5FyrJQDAtXGBB0cVCi+RtBsfwSk3U/5gIAj5zQwKbUOci7dgdzY035AqmFU3Bt8jfkxpIVlmeoEWQIxLFzOoEhUBIszGsF94F+zucz3Uz8QM9pqU7/iSF+iX0FUrUW2P1EmqkA3taOQsjRwiF9wVshDrDhrtDCZM/ZoyiE6hY+CzCYCqSwA9n5CRL87LNAvLYkovKfGGTdhf97CXL7j61LA5BI+cWfhBsWI3m/CCyXgfI/3d6BsFweTh/XmztLeA07bvFV5hywMU7u87vODDjYRMuoTuFdtf44zvLTofA1SagJ+A+G9a260JecaLp/TQ2Lw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:LOAP265MB8560.GBRP265.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(376014)(1800799024)(23010399003)(7416014)(10070799003)(366016)(56012099006)(921020)(5023799004)(10067099003)(22082099003)(18002099003)(3023799007);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?eURZM0dJdCtpelZ1Y28wZjQydkhsT1IrK2M5TWNsbFgxTGtzU2dlbks4WFRY?= =?utf-8?B?RDJjV3ZnUHBZMzRBeEhtSXRuTDJFN1Q2SHloNkhCWGROUzY3dXU0RXllUmZm?= =?utf-8?B?cEYxTkVnbVd6bXp6WUZiQklpdmZxN1Nsb2ppNHFHS3ZkaHFHd3B2bWNTL2Q0?= =?utf-8?B?YmFwdHhBeExvUkpZWjVzckNWVG4vbGxkZmJnYmtNcktaakpQcHd5WGZtY0Z2?= =?utf-8?B?bXFaRjVQZjkrYnN3b1psQ0g4T3R1L1lTSzd4bFVLMlJUOXZMd3dmc0U2aldq?= =?utf-8?B?MFVyRi92WnhLUUw0YzlXTmFsbmdBVnZEaSt1SWZ1Q2JBODNydTJ2L2ZJVjRn?= =?utf-8?B?aktUS042ODBwUzY2dWl4d1hic3Q0OHJWcllqb0NxTkdNdHIyRlVLeFhLc05U?= =?utf-8?B?WldWUGhGbDNLRjczY1ZNK1BFUW50akxkbkpUeEtLejdtYzVCMFcyZHU2bUtq?= =?utf-8?B?SDRkYnQ1RUpYaGp1L0JHTGRjaVRZVFBCTzZnL3dhLzlXdzdHeFRHbXM3clZw?= =?utf-8?B?RWdMOUZpZFZTdFQzcmRNVG55d2VVRkxGbTBXSWpSRzR2dUFNMFk1TEl0MHUr?= =?utf-8?B?K253ai9zOTl4K2Fzem9XdXNzSDBad0NLOVk5aTQwejhWQ3Aya3FDNi9lRW0y?= =?utf-8?B?TFRpb3RqQTlDMGV3L3RId2pZYXVNQ1RoT21kcGRzb1ZycTV2c2QzTkF0bjBH?= =?utf-8?B?eGhRV0pXeU12SEZsQlVveFdlbzFmS25DeVN0aGtsS2RFdG03YVl2ZGJ5cmJk?= =?utf-8?B?Y1JlTTd1NUtXam5ValVoOUdUZkdSWEtBaVFra243N0FiaytEcGpiWUIvRlZF?= =?utf-8?B?Q21udHJibWJZZWlRU3k0ME1LM0grOVhxWmdFQis5My9zbHpPZ3pySW1uamNW?= =?utf-8?B?TDc5azFtWGpURnNnZmh5MlBmemczMU11N09IUmFqbHpzTm5TUDhDQ2t1M05x?= =?utf-8?B?NHkwY3lqdTNkeU5GREUwMUJBNWRVc3JjckxsOVhJcTI1RTZUY2tBcTlqYjBJ?= =?utf-8?B?QzYrZFduL2l5QnljbGJDYXp5ZzgvRDhNN3JwWFZUZk9QeHhOMVZXSVB6VGxW?= =?utf-8?B?YjdZMDlpZFRGU0FtVXV4akZ2ZCtZeUtvZ3RnVWY5Y2RBdlBYWEJnaGhEeW52?= =?utf-8?B?M1dVMlZEUktEcklKQkFiaCtqNzF4VFNGcldRbUV6V0FITkFxWWdIdmZTcnNT?= =?utf-8?B?c2V4MEE4SmNjNllzcVp1eGlUZ3VPNXNybHIrQW9LSmlJYnJNN1hMWCtFL3lj?= =?utf-8?B?cDNpU1hTMXdpY3hlTVVnVmRzWnF2WWMyVE5CVERVN2RVVWVsa1MwNkRRNGcy?= =?utf-8?B?SWxlTUJHNnRKNkY3L0NJTmhPcXJQS0NScFl0aFBxcC9rNzJSdHQ4NG9lWUhM?= =?utf-8?B?LzhYR1U3dXh2dXN6NHNZV3BVR1QxQ05zblV4SUQ0aHFpTXR0bEpiQzhoZGZU?= =?utf-8?B?VDhMVlIxUXplMjZjaVhxRE50V2JuY1hqQWx0bnhEQ2xHRXhZZFViZE45SXlI?= =?utf-8?B?Y1BRa20wQkFpTDFtem5JYmNhS21kTDhtL3dhL1NDZk15UE5WTGY5TXczRVZx?= =?utf-8?B?QXFuSkNJZWp0eUdVYVRCK0tqYlM1Y3k2bVBjZFJJQnUxbFN5RmhUbkpyR0lz?= =?utf-8?B?Zlc2eU1tOEU0MEtCellVT04xdGZFL1R5ZmZMUTMyVnB0NFlvV1dQK2pTWFZ0?= =?utf-8?B?bGhKeUd5MXFRaVBaS1g5cndHYzhIQ0tjODl1VURpbmYrdVY4ajUrRVdDTWE2?= =?utf-8?B?UUpBekNpREJyL2tNQlh1YU9lSHdHeGppV0RBdVh2ZFJ4YXNsRWlSWWduRDBq?= =?utf-8?B?ZUt3RFBzb3QzZkVKNXNKV0hTTVZodzdlaThzUUhRNUFiRkFidUZDNHcwRVpV?= =?utf-8?B?Nm9jcjlORXJWZDhUeFc2K3pQbUpBUXJONW5KL1MwWEZHdGNYNGcycjBlcjRm?= =?utf-8?B?TmwvTHdWUTBHZU0vRUxpSjBuTy90V0tDd3RJTXRRNk5OcWxUaURtQm9nWjBK?= =?utf-8?B?OVVMa0JSVk5Xc1U2VDhxZDlSSlhqMjZPeVFOYXhHS1ovRVZXcFlsZHlPalVG?= =?utf-8?B?RWxobHRBa3R3MlZZZXkxQ3pWRHRaME9EdDVodTJ3SkVYeVAwUlphWFluOHdo?= =?utf-8?B?WWVmOHcwY3l3ZnBkNE9VVjZxL2MxWTJrT3c3UVRaY09tQmVFSXF4TEp6aFJr?= =?utf-8?B?aEtHUUw5VkVub2ZhVW9ZeFZVTW9wWXp2c1FpSCszOUYxc29pY1lld0pHaGIr?= =?utf-8?B?NnA2bVZOQ2J3MEg0MUZ5MEFjQk1RY09CNHdXZ0JJbE9xdG50TlN4SzY2L1h2?= =?utf-8?B?RFNlckxDS1cvenJjK3Y4bFFyeWZ4WjV2QzFwSGJzR1pzZWNwWEZnZz09?= X-OriginatorOrg: garyguo.net X-MS-Exchange-CrossTenant-Network-Message-Id: 453612f0-3aa5-4cc0-d627-08df093d8e84 X-MS-Exchange-CrossTenant-AuthSource: LOAP265MB8560.GBRP265.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Sep 2026 22:00:09.9392 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bbc898ad-b10f-4e10-8552-d9377b823d45 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: TYG57/Q960lNfSlpiQU4QmZdOkJAx0HCMnC/uiP0N5geXGC7uFdmIbLg2njOdX8e7v4IRLTvCy0yOtxb5k7CLA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CWXP265MB2773 This parameter is needed currently because doctests want to override the file. Simplify it by changing it to use `file!()`. Have doctests override `file!()` macro to achieve the current behavior. This allows us to remove the `file` helper and associated Kconfig options. Reviewed-by: David Gow Signed-off-by: Gary Guo --- Documentation/rust/general-information.rst | 4 ++-- init/Kconfig | 3 --- rust/kernel/kunit.rs | 9 +++++---- rust/macros/helpers.rs | 16 ---------------- rust/macros/kunit.rs | 5 ++--- rust/macros/lib.rs | 5 ----- scripts/rustdoc_test_gen.rs | 10 ++++++++-- 7 files changed, 17 insertions(+), 35 deletions(-) diff --git a/Documentation/rust/general-information.rst b/Documentation/rus= t/general-information.rst index 09234bed272c..20e3178ebfd4 100644 --- a/Documentation/rust/general-information.rst +++ b/Documentation/rust/general-information.rst @@ -157,5 +157,5 @@ numerical comparisons, one may define a new Kconfig sym= bol: =20 .. code-block:: kconfig =20 - config RUSTC_HAS_SPAN_FILE - def_bool RUSTC_VERSION >=3D 108800 + config RUSTC_HAS_FILE_AS_C_STR + def_bool RUSTC_VERSION >=3D 109100 diff --git a/init/Kconfig b/init/Kconfig index 8583d9f06c52..24b019104d88 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -178,9 +178,6 @@ config LD_CAN_USE_KEEP_IN_OVERLAY # https://github.com/llvm/llvm-project/pull/130661 def_bool LD_IS_BFD || LLD_VERSION >=3D 210000 =20 -config RUSTC_HAS_SPAN_FILE - def_bool RUSTC_VERSION >=3D 108800 - config RUSTC_HAS_UNNECESSARY_TRANSMUTES def_bool RUSTC_VERSION >=3D 108800 =20 diff --git a/rust/kernel/kunit.rs b/rust/kernel/kunit.rs index 91eaff8c186a..12084873b51e 100644 --- a/rust/kernel/kunit.rs +++ b/rust/kernel/kunit.rs @@ -58,14 +58,15 @@ pub fn info(args: fmt::Arguments<'_>) { #[doc(hidden)] #[macro_export] macro_rules! kunit_assert { - ($name:literal, $file:literal, $diff:expr, $condition:expr $(,)?) =3D>= { + ($name:literal, $diff:expr, $condition:expr $(,)?) =3D> { 'out: { // Do nothing if the condition is `true`. if $condition { break 'out; } =20 - static FILE: &'static $crate::str::CStr =3D $file; + // Use `file!()` instead of `::core::file!()` here so it can b= e overridden. + static FILE: &'static $crate::str::CStr =3D $crate::c_str!(fil= e!()); static LINE: i32 =3D ::core::line!() as i32 - $diff; static CONDITION: &'static $crate::str::CStr =3D $crate::c_str= !(stringify!($condition)); =20 @@ -164,10 +165,10 @@ unsafe impl Sync for UnaryAssert {} #[doc(hidden)] #[macro_export] macro_rules! kunit_assert_eq { - ($name:literal, $file:literal, $diff:expr, $left:expr, $right:expr $(,= )?) =3D> {{ + ($name:literal, $diff:expr, $left:expr, $right:expr $(,)?) =3D> {{ // For the moment, we just forward to the expression assert becaus= e, for binary asserts, // KUnit supports only a few types (e.g. integers). - $crate::kunit_assert!($name, $file, $diff, $left =3D=3D $right); + $crate::kunit_assert!($name, $diff, $left =3D=3D $right); }}; } =20 diff --git a/rust/macros/helpers.rs b/rust/macros/helpers.rs index d18fbf4daa0a..8cc9a20f470e 100644 --- a/rust/macros/helpers.rs +++ b/rust/macros/helpers.rs @@ -38,22 +38,6 @@ pub(crate) fn value(&self) -> String { } } =20 -pub(crate) fn file() -> String { - #[cfg(not(CONFIG_RUSTC_HAS_SPAN_FILE))] - { - proc_macro::Span::call_site() - .source_file() - .path() - .to_string_lossy() - .into_owned() - } - - #[cfg(CONFIG_RUSTC_HAS_SPAN_FILE)] - { - proc_macro::Span::call_site().file() - } -} - /// Obtain all `#[cfg]` attributes. pub(crate) fn gather_cfg_attrs(attr: &[Attribute]) -> impl Iterator + '_ { attr.iter().filter(|a| a.path().is_ident("cfg")) diff --git a/rust/macros/kunit.rs b/rust/macros/kunit.rs index ae20ed6768f1..936eff014870 100644 --- a/rust/macros/kunit.rs +++ b/rust/macros/kunit.rs @@ -109,12 +109,11 @@ pub(crate) fn kunit_tests(test_suite: Ident, mut modu= le: ItemMod) -> Result {{ - kernel::kunit_assert!(#test_str, #path, 0, $cond); + kernel::kunit_assert!(#test_str, 0, $cond); }} } }); @@ -122,7 +121,7 @@ macro_rules! assert { #[allow(unused)] macro_rules! assert_eq { ($left:expr, $right:expr $(,)?) =3D> {{ - kernel::kunit_assert_eq!(#test_str, #path, 0, $left, $= right); + kernel::kunit_assert_eq!(#test_str, 0, $left, $right); }} } }); diff --git a/rust/macros/lib.rs b/rust/macros/lib.rs index 24f96feaeb34..6916195f0051 100644 --- a/rust/macros/lib.rs +++ b/rust/macros/lib.rs @@ -8,11 +8,6 @@ =20 // Stable since Rust 1.87.0. #![feature(extract_if)] -// -// Stable since Rust 1.88.0 under a different name, `proc_macro_span_file`, -// which was added in Rust 1.88.0. This is why `cfg_attr` is used here, i.= e. -// to avoid depending on the full `proc_macro_span` on Rust >=3D 1.88.0. -#![cfg_attr(not(CONFIG_RUSTC_HAS_SPAN_FILE), feature(proc_macro_span))] =20 mod concat_idents; mod export; diff --git a/scripts/rustdoc_test_gen.rs b/scripts/rustdoc_test_gen.rs index d087c0d9fcb3..bb57745ec339 100644 --- a/scripts/rustdoc_test_gen.rs +++ b/scripts/rustdoc_test_gen.rs @@ -176,12 +176,18 @@ fn main() { r#"/// Generated `{name}` KUnit test case from a Rust document= ation test. #[no_mangle] pub extern "C" fn {kunit_name}(__kunit_test: *mut ::kernel::bindings::kuni= t) {{ + /// Overrides the usual [`file!`] macro with one that expands to the r= eal path. + #[allow(unused)] + macro_rules! file {{ + () =3D> {{ "{real_path}" }} + }} + /// Overrides the usual [`assert!`] macro with one that calls KUnit in= stead. #[allow(unused)] macro_rules! assert {{ ($cond:expr $(,)?) =3D> {{{{ ::kernel::kunit_assert!( - "{kunit_name}", c"{real_path}", __DOCTEST_ANCHOR - {line},= $cond + "{kunit_name}", __DOCTEST_ANCHOR - {line}, $cond ); }}}} }} @@ -191,7 +197,7 @@ macro_rules! assert {{ macro_rules! assert_eq {{ ($left:expr, $right:expr $(,)?) =3D> {{{{ ::kernel::kunit_assert_eq!( - "{kunit_name}", c"{real_path}", __DOCTEST_ANCHOR - {line},= $left, $right + "{kunit_name}", __DOCTEST_ANCHOR - {line}, $left, $right ); }}}} }} --=20 2.54.0 From nobody Sat Sep 26 09:19:21 2026 Received: from LO2P265CU024.outbound.protection.outlook.com (mail-uksouthazon11021138.outbound.protection.outlook.com [52.101.95.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 618D5421253; Wed, 2 Sep 2026 22:00:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.95.138 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788386433; cv=fail; b=bFT+TBSjT3M082ffIo896R0kcl29Cr0lvS2vDNPYBjNNGXhS0Ll48B2w9Xz0WcGpz7hYZE6K2Vo4dqEk+1cKwUQBkckaV8la5gpsp0a3jdsENzpjVhXQqUCDDvExHrKIIrYJ9dMK3d2S6Mnma0sYh2kE2aGxCni6x4G9akNMmgQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788386433; c=relaxed/simple; bh=YufZupjiRUchUD1oGD80hU8jFBTIk8lZVj6k15paxBA=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=CKi8U6OxfDu1TA9oRKMfQMFcNw8ou3WCQYq5uSKlTIVyVazngBs12Ikn2Pt1Lkf8GJqjWEqoShZ3jtYZj9A+bsAdrLMvgoFCFbqyvrK5mRgHEp1eAlZDmuoEkcsSAaptq90J18HtjY++AYH+pcQlqhpbrFf/syDZ+BZRgNtGIRw= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=garyguo.net; spf=pass smtp.mailfrom=garyguo.net; dkim=pass (1024-bit key) header.d=garyguo.net header.i=@garyguo.net header.b=FtsV5P1U; arc=fail smtp.client-ip=52.101.95.138 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=garyguo.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=garyguo.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=garyguo.net header.i=@garyguo.net header.b="FtsV5P1U" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=MLQ+PHSB9TO6VyilAu69yErWoFgPdmjNrQyuRfehUuismBBJiKWDszV02VeBoUaDk4s7MutkZXmybIhswlGO2H89/yCjZp8nEEwix2MexskKKVCKnhzaNMdlKRfKod2Pd0CuJc73b/ikS3XIUKuI7fTbq7HiNd2z7fqB/a9Nchjcjb/ttwDPURki9q86wuCWJE+QFm11B3CsZeyQutPg6uI90/8XXD9LVpYwZ4o807oiC+3xRCx18zs8rusUHJ2ABqJLVqUidbyGtnba5PgXdOa7FC4/91ILTlp93GG1qQwlCTWvfeSuPNsShWcBvtDdyn97jNuDznP+3+NwtVQgGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=sZesE9lpj7ulg9y0HvQ8D/w7MProkMlLIKecRPAwnfs=; b=bZCayMmz2QXcW0crcXPaDOLH/+M4/3rxulAzRXI/QY+r3VbHi4iPbhHaMnUVhuWWKSvNt69fbkWVpqkNPgiSBgpkac3OxbVqiOuDuM6k7zXy+8SSK6dxkVYNVI+LZ+bofQW1btfSXAHxQy8t6cYhPWJvfj5mE5EeYg1q7gOYO/0wK06FnqzET2o10fpUtgdknqFj70kPaXESsf5z830SOs0LP6lJ/DG4ZR5pdtV30IubOfA3ZBpfL61PYxDINj5ayHqJZgedGfXYSulcnCIg7LZjBXP5t49b2M+2Xw3O2M2xWYZNOjBy+KLejEe1BYB+OqH6N+ebfqjr82N2sZy1LA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=garyguo.net; dmarc=pass action=none header.from=garyguo.net; dkim=pass header.d=garyguo.net; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=garyguo.net; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=sZesE9lpj7ulg9y0HvQ8D/w7MProkMlLIKecRPAwnfs=; b=FtsV5P1Uevjj39EFLNDMcTu3AGE+zaD6BlqMMgf3WtvjAvRpjtXXPxm+nVvNmaqO8mOIPKgoRjS9ug+O+xV2h+X6NtnluB8rNSy4mbupt/F/8SpGiSp04NrZsHEIf1h9ihKCz0vaMQ1zdMI+VV5x+Heh6kpNaYwSpUeS3JOjxjM= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=garyguo.net; Received: from LOAP265MB8560.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:4ab::19) by CWXP265MB2773.GBRP265.PROD.OUTLOOK.COM (2603:10a6:400:aa::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.360.13; Wed, 2 Sep 2026 22:00:10 +0000 Received: from LOAP265MB8560.GBRP265.PROD.OUTLOOK.COM ([fe80::f60b:1537:68d7:4fc1]) by LOAP265MB8560.GBRP265.PROD.OUTLOOK.COM ([fe80::f60b:1537:68d7:4fc1%4]) with mapi id 15.21.0360.008; Wed, 2 Sep 2026 22:00:10 +0000 From: Gary Guo Date: Wed, 02 Sep 2026 23:00:00 +0100 Subject: [PATCH v2 2/3] rust: kunit: use `line!()` inside `kunit_assert!` Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260902-kunit-v2-2-eda3ed6c00c5@garyguo.net> References: <20260902-kunit-v2-0-eda3ed6c00c5@garyguo.net> In-Reply-To: <20260902-kunit-v2-0-eda3ed6c00c5@garyguo.net> To: Miguel Ojeda , Boqun Feng , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Daniel Almeida , Tamir Duberstein , Alexandre Courbot , =?utf-8?q?Onur_=C3=96zkan?= , Brendan Higgins , David Gow , Rae Moar Cc: rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, Gary Guo X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1788386408; l=5845; i=gary@garyguo.net; s=20221204; h=from:subject:message-id; bh=YufZupjiRUchUD1oGD80hU8jFBTIk8lZVj6k15paxBA=; b=mdazVjoKHDmKF4eecMkgiftRqYjCiUezVDlp4EaSsf22DEN8p/eou+zlSWkcqNgLAbQwAo2VH scANgRpr+T8AsDwHQPpUdf5UPKTkXzPPIYlH7Am1EV9Aqz/Xm1poT2h X-Developer-Key: i=gary@garyguo.net; a=ed25519; pk=vB3uIX95SM4eVrIqo1DWNWKDKD2xzB+yLLLr0yOPYMo= X-ClientProxiedBy: CWLP265CA0322.GBRP265.PROD.OUTLOOK.COM (2603:10a6:401:57::22) To LOAP265MB8560.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:4ab::19) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: LOAP265MB8560:EE_|CWXP265MB2773:EE_ X-MS-Office365-Filtering-Correlation-Id: b33727ed-a2f3-4a89-673f-08df093d8ef2 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|23010399003|7416014|10070799003|366016|56012099006|921020|5023799004|6133799003|10067099003|22082099003|18002099003|3023799007; X-Microsoft-Antispam-Message-Info: 4FBPuYCdtbiOYJPgTEhIKfx++QawR+Pv6UtSJyWaXKLC3LSdxgxBAOuco3FqYSjylbSKw31aw2AwzAcTEuEk+yiBb+iVBTQ3IF8VSDNgtxuowT6da7FiN5Co5wsrb+BZdxMr7Q9Zz64cCQ0dz9hM36LpEe6M99IxY+ywk3csGjG3pAhmnEuxhOHKjL5lG/a7CC+0nsGo5NH7263bC64xfp/+639DX8VBXkQfbfahlpEUfgFiChFiNJSmWHaxIehb6jC1Ijh6uzEcSSfe+8lN6H0F0P6fyiNUq7pPQapVlOUMo1lOCIaTpyBwsPbdhu8/pcJOXFKSNzr59ok+6Tm/4Cza9xhPgP+gE4wiBOcmEMgGuQ7Qk7YpJtMViAKNGLeT6fEadtM03qtAwxXiTT0Kwc9dFgcueBz96XigJYeAChur2NkK/BNSypcb66n1xJISzJsR/XUnMxjyYsc87lZ4CKKx6TBAQFAd/FdBQwS7gK9X9TOtVeQZ21Cz/nmXaSCudcb6L7Rvc/yeOILOTKEJqO7jr7mQkgVJQbV9Hn86m3EvXABqssqK1suEbOFenAb3cbyHNEG8qi+3qGOYzkNaLMwJdeLXdZOdfXuUyW8FkdhCOt79hrpxXX77jBw1BGJl2QiH4/oiJQw5wBVEcOKnRwJ47NDJXzclT3bEwgMc4SgIXKyDlXhQ+SWVaFJwsI5oXxCpp8s+QFh5FzgU9prSLQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:LOAP265MB8560.GBRP265.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(376014)(1800799024)(23010399003)(7416014)(10070799003)(366016)(56012099006)(921020)(5023799004)(6133799003)(10067099003)(22082099003)(18002099003)(3023799007);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?c0tENFJwcWxrRVp3d216NFdYVWZnS2JCRXhJbEVTR1lzNFZnbXlMZ3FVNXZT?= =?utf-8?B?ZENFeFo3bE0xU0dMTkFMa3VsM2ZKUWw5ektXVEVtWllwWXdXS1lGL0FOK05Z?= =?utf-8?B?YVpuR0F2RGVxYzJheldWVy9Oc2p2cEVRMDZ0MWowUkxHRGduTXNqV2RLNTY4?= =?utf-8?B?bnNDaHdWV3JEb0h1QkNWakJxSHR3UXUzazJZS0NrR01ZNjdjZENoblEvVlFI?= =?utf-8?B?V050TXBsZTJBMUJMV3VzNTFiZXI5M3hueDVwK0dsYmJGTC9RVTg1empOL0ZU?= =?utf-8?B?cFhoazdpOWZ5VTNPa2NkN0U2bmNGRDJpM0lKTXkzTVQ3SzlyTTB1VXZBOGZq?= =?utf-8?B?WkRUcXA4a2tRbytlM2JrT1g0VHAwZG5QZ1BCeEhTb0pUWUJ6ODIzKzZ0L0VJ?= =?utf-8?B?UElPdkxuV1cyK0NWQVp0MFNIRXp1aFFmeWZJYXlPdWlhcER4R0RLQWNqdlcx?= =?utf-8?B?SWVsR0RvVkVUZ1MyWkpoNE9NT2xIajc1QlZncVNLN2QzTXpHMngvc3E5QXV2?= =?utf-8?B?YlFmLytlTGFBNjBhTS9ja2xnQnZtcEo1TXYwQUVTMExEWTN4OU0wK1kzQ0xi?= =?utf-8?B?TmJ5UGRtYitiSE5mSG5NMVVPeHRzU2svUXlMTW5YWG10ckVxa1ljNXhNQVRO?= =?utf-8?B?R0JkWmZrcjM4dldsOFRMSk10Z3ZTcTMxY3lpYkF0YXVlcit3TjlpeWtCSHdt?= =?utf-8?B?UHlYQ1dhN2Fpdm5jSnRSVXlsMUovdnBJTUdDd3RYa0xyK2FiM2NVUmg2UnRj?= =?utf-8?B?L1NacnRxZklTUFMwYnptWFVhMjVhK0NiNkRPTXJHdHZ5Vlk5Zy9xUVZGR0tG?= =?utf-8?B?cTV5NmVJOVFzQit5ZVZTb2NETXdJdVVKSlRqVjc5M2pXSi96cWRIYlJXRWVP?= =?utf-8?B?YXJ0cWxIMVBuUVhOQ1o5WFQxMkQ3R2JxMzdONzZsK1FvWlFQRU1DMGlKQ0xo?= =?utf-8?B?NnJxUWpEaGhzTDQ3czBYUUtNNmE2WG1HT1lHU0pSREFqbUVTZXkzSUNSTis1?= =?utf-8?B?eVJzWjEvSWhWRGxIYkVTK1ozUWZhSG41Sm5xS1l3aVNXMVczYzBIdUdEWjBK?= =?utf-8?B?aEZLT0o4OUY0T25ZZ2YwRHZpOWJSMGFqL1VxOUFJdVdmdU84NDdIRkx2UjBT?= =?utf-8?B?REFnQm8rcUhxSDhOOTZCQXg3N1pPcmpmcVBFNkREbnVySzY4cExBdy8vUG4x?= =?utf-8?B?QzY4U2xkRmVuWmZSbGtDNHp6Yk0zQXV4R2pjTGh2SXNucFNESmpDSEpHWXZx?= =?utf-8?B?Y0dRejFJMm1IcXduRDJFZytrM2trZU1YU0kxTUNQaGFjR0t4SG1SQmlCakRS?= =?utf-8?B?Y0ppWGRwRlZMb0pMSVYxU1Znb3JJZkZid1Z0QUVaL1N6M2t1cnMxS2lqdTdx?= =?utf-8?B?aEI4cko0OHNFZDBnbzVyaUZlek91TDZGZ2c3RDg0NXUvRjAyeUp4dXU2TCtB?= =?utf-8?B?Ym96RU1sdzRNbDFHbnR3RHJGZk5HREgyVmIvbkVKM2QrWjRhRjF0U1p2eW1r?= =?utf-8?B?ejFxUDBEMEdqdHhNb0F0ZkxYMVgwbGJmMXVqd2U0dlBCYTdrWVlYSWhRMlRR?= =?utf-8?B?ZEtUaHZoVy9QV2M5TlF0YU5BQ05PZ1hsU3oyam9EOGpIQ2tDOXF3ZVRQclhs?= =?utf-8?B?UDVmeUFteFo3eGVvNnViZE9tOG1mSFdVcVdCSUl0SUloQWJ1N20zM3hnZUY2?= =?utf-8?B?bTBHR3huZnBOd1NqZXgzNStKQjhQbDlsb2VPUlhrQi82RGdyZEZsam1UUkFm?= =?utf-8?B?cUJpaXd0bDJZQ3hITlFNalJlVUlkTlVzb2U4K1BNc2FybXhpbkdsNXVROHY5?= =?utf-8?B?dmViNFBxZThTR0VHcGtWcnlMZHptNzdiTEc1d2FMeFJRLzhXQmpWUDlidFJo?= =?utf-8?B?NnlJM1NQeHh5L29EaWJkdjBpTGFMc0IyRDdtalY2SVRCSVMyRmkwVjlVRXB0?= =?utf-8?B?NkFIYmxXeTdObmR5WERJcWhGRUVFN29RRnRyRGlaaWZ4TGR3RklnRmpOSVg3?= =?utf-8?B?T2ZYREp5UW55WnBHVi9DcHdORWlGcjR0ZnA3Y2ZCaUlWN09hNEJWK2Y1Qjh6?= =?utf-8?B?T1BSLy9GRXBWZ2dGRkJnaGxmRjBIK3RUT2oxbitHb2VMOGJCTjBDOW5aM2Vp?= =?utf-8?B?T0FxdUpnV2Z0cDJlWlhoWE1zbDRFRGMwUHFZVU4rb3NnTUM3M1BpcDZ6bWNx?= =?utf-8?B?ekNqSmxvUE9MWjJTSndobTl0bFNpeTNvWWlKYUFJSEs3cUJuUDZUa1VlaWxN?= =?utf-8?B?REZMT0c4ZXV2UklROXAvTXZtTjI4M0wxV3ZNTTR5TWIxM0xyYS9TUXVLTjRR?= =?utf-8?B?ZHBDSHZPY0ZPZHhuR0ZwVi81bVh6K0R3bmVlYVF4SERWYWNMVkVyUT09?= X-OriginatorOrg: garyguo.net X-MS-Exchange-CrossTenant-Network-Message-Id: b33727ed-a2f3-4a89-673f-08df093d8ef2 X-MS-Exchange-CrossTenant-AuthSource: LOAP265MB8560.GBRP265.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Sep 2026 22:00:10.6287 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bbc898ad-b10f-4e10-8552-d9377b823d45 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: gtsb/3x/Up3fKKe92StexLmRZTCINOu1z3PY6GB/zNKAwMM53mi0hOeEQM6jarLk37pJUyN4VqRq0iCwELRMnw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CWXP265MB2773 The `diff` parameter is needed currently because doctests want to override the line number. Simplify it by changing it to use `line!()`. Have doctests override `line!()` macro to achieve the current behavior. A few current doctests (or their invoked macros) require `line!()` to expand to literal; they're updated to use `::core::line!()` instead. Reviewed-by: David Gow Signed-off-by: Gary Guo --- rust/kernel/kunit.rs | 8 ++++---- rust/kernel/str.rs | 2 +- rust/macros/kunit.rs | 4 ++-- scripts/rustdoc_test_gen.rs | 16 ++++++++++++---- 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/rust/kernel/kunit.rs b/rust/kernel/kunit.rs index 12084873b51e..27b109923407 100644 --- a/rust/kernel/kunit.rs +++ b/rust/kernel/kunit.rs @@ -58,7 +58,7 @@ pub fn info(args: fmt::Arguments<'_>) { #[doc(hidden)] #[macro_export] macro_rules! kunit_assert { - ($name:literal, $diff:expr, $condition:expr $(,)?) =3D> { + ($name:literal, $condition:expr $(,)?) =3D> { 'out: { // Do nothing if the condition is `true`. if $condition { @@ -67,7 +67,7 @@ macro_rules! kunit_assert { =20 // Use `file!()` instead of `::core::file!()` here so it can b= e overridden. static FILE: &'static $crate::str::CStr =3D $crate::c_str!(fil= e!()); - static LINE: i32 =3D ::core::line!() as i32 - $diff; + static LINE: i32 =3D line!() as i32; static CONDITION: &'static $crate::str::CStr =3D $crate::c_str= !(stringify!($condition)); =20 // SAFETY: FFI call without safety requirements. @@ -165,10 +165,10 @@ unsafe impl Sync for UnaryAssert {} #[doc(hidden)] #[macro_export] macro_rules! kunit_assert_eq { - ($name:literal, $diff:expr, $left:expr, $right:expr $(,)?) =3D> {{ + ($name:literal, $left:expr, $right:expr $(,)?) =3D> {{ // For the moment, we just forward to the expression assert becaus= e, for binary asserts, // KUnit supports only a few types (e.g. integers). - $crate::kunit_assert!($name, $diff, $left =3D=3D $right); + $crate::kunit_assert!($name, $left =3D=3D $right); }}; } =20 diff --git a/rust/kernel/str.rs b/rust/kernel/str.rs index b3caa9a1c898..644b4279a116 100644 --- a/rust/kernel/str.rs +++ b/rust/kernel/str.rs @@ -411,7 +411,7 @@ fn as_ref(&self) -> &BStr { /// const BAD: &CStr =3D c_str!("literal"); /// /// // `c_str!` is still needed for static non-literal C strings. -/// const GOOD: &CStr =3D c_str!(concat!(file!(), ":", line!(), ": My CStr= !")); +/// const GOOD: &CStr =3D c_str!(concat!(file!(), ":", ::core::line!(), ":= My CStr!")); /// ``` #[macro_export] macro_rules! c_str { diff --git a/rust/macros/kunit.rs b/rust/macros/kunit.rs index 936eff014870..e9152b9d51f9 100644 --- a/rust/macros/kunit.rs +++ b/rust/macros/kunit.rs @@ -113,7 +113,7 @@ pub(crate) fn kunit_tests(test_suite: Ident, mut module= : ItemMod) -> Result {{ - kernel::kunit_assert!(#test_str, 0, $cond); + kernel::kunit_assert!(#test_str, $cond); }} } }); @@ -121,7 +121,7 @@ macro_rules! assert { #[allow(unused)] macro_rules! assert_eq { ($left:expr, $right:expr $(,)?) =3D> {{ - kernel::kunit_assert_eq!(#test_str, 0, $left, $right); + kernel::kunit_assert_eq!(#test_str, $left, $right); }} } }); diff --git a/scripts/rustdoc_test_gen.rs b/scripts/rustdoc_test_gen.rs index bb57745ec339..bb870f83dde2 100644 --- a/scripts/rustdoc_test_gen.rs +++ b/scripts/rustdoc_test_gen.rs @@ -176,18 +176,26 @@ fn main() { r#"/// Generated `{name}` KUnit test case from a Rust document= ation test. #[no_mangle] pub extern "C" fn {kunit_name}(__kunit_test: *mut ::kernel::bindings::kuni= t) {{ - /// Overrides the usual [`file!`] macro with one that expands to the r= eal path. + // Overrides the usual [`file!`] macro with one that expands to the re= al path. #[allow(unused)] macro_rules! file {{ () =3D> {{ "{real_path}" }} }} =20 + // Overrides the usual [`line!`] macro with one that expands to the re= al line number. + #[allow(unused)] + macro_rules! line {{ + // NOTE: This does not expand to a literal, but a constant express= ion. + // Therefore code that depends on `line!()` being overrideable nee= ds special adjustment. + () =3D> {{ const {{ ::core::line!() - __DOCTEST_ANCHOR + {line} }}= }} + }} + /// Overrides the usual [`assert!`] macro with one that calls KUnit in= stead. #[allow(unused)] macro_rules! assert {{ ($cond:expr $(,)?) =3D> {{{{ ::kernel::kunit_assert!( - "{kunit_name}", __DOCTEST_ANCHOR - {line}, $cond + "{kunit_name}", $cond ); }}}} }} @@ -197,7 +205,7 @@ macro_rules! assert {{ macro_rules! assert_eq {{ ($left:expr, $right:expr $(,)?) =3D> {{{{ ::kernel::kunit_assert_eq!( - "{kunit_name}", __DOCTEST_ANCHOR - {line}, $left, $right + "{kunit_name}", $left, $right ); }}}} }} @@ -219,7 +227,7 @@ macro_rules! assert_eq {{ =20 /// The anchor where the test code body starts. #[allow(unused)] - static __DOCTEST_ANCHOR: i32 =3D ::core::line!() as i32 + {body_offset= } + 2; + static __DOCTEST_ANCHOR: u32 =3D ::core::line!() + {body_offset} + 2; {{ #![allow(unreachable_pub, clippy::disallowed_names)] {body} --=20 2.54.0 From nobody Sat Sep 26 09:19:21 2026 Received: from LO2P265CU024.outbound.protection.outlook.com (mail-uksouthazon11021138.outbound.protection.outlook.com [52.101.95.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9FB623CEBA6; Wed, 2 Sep 2026 22:00:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.95.138 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788386441; cv=fail; b=twd3BUlz1EkeuKDVEv6YCnBbbHu6gmxKXcm0W6imIdG1va63lFp996pKbMbF/YTzTYqulRwPgww0VQ4wY7auhNa6j4+XifCe3Fr+ZP60vVp2DxQ3EFqREOJgyrYfD8F/L6gfA74DTjuAd+LS2MJ7l28SV0WYx0SdpmNjbXpHTmc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788386441; c=relaxed/simple; bh=uAZWyJ4TqhHSbqxR098SNMt+LnK5fZaIrY9HwZF5H1c=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=AjMEwbzPDOZxL6UaFnjb3l0t5wzWt28ItW55qISgT4ylAjKNAJIMn3Jf/FNSr9DKwUbBZ8amUcLuHZE+3YKJ1HvCZRsCMJLW+q7J8Ejgx+sQGy/jObyPlNs7ejxkO0pPizZlw3bd1Has76tNoU2rxBGyN6ptXpQTNZp/WAxmzcU= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=garyguo.net; spf=pass smtp.mailfrom=garyguo.net; dkim=pass (1024-bit key) header.d=garyguo.net header.i=@garyguo.net header.b=HUqhjzQd; arc=fail smtp.client-ip=52.101.95.138 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=garyguo.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=garyguo.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=garyguo.net header.i=@garyguo.net header.b="HUqhjzQd" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=lBYxYwcLqG/GHMVT6vM1epZtvsGwgJBKf3egMYWSM/OxSWL1NZ8vhAm/HMP2VXKW6A52dM7+k2KSHs9tQYnDKAfcHREeI0wsKzEEVjH8bYSs7fG0zsV7whh7o2+NvFbfrBmDhPn+bUYXw+6fk2lJR9dIr0OI31hMxZleCrC3K4ON5lVIE1yT9mQ37/KRsatFEM+4+UQDhKpPBGF/K7CQ8bcQ6okSPI8Bb1ALnkjUbUaVuN3b4Zz0euYmL4QYeoXs0jzIbFEXiX2H5YzEs7V+A/aLmDbxoSpmxTG4OWcuIeror935Hjld2v5rxXZfiifEoksFXJB+d0qoCko43vstkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Kzx5qFIUykHljOmd7LUmPjZhL9FahW+74V3kofS+1WY=; b=m+rd33A1d/k/awKdbJu431TEoQsnkFA6D3m1MrQeUYE+VW33xjqTvBycw7pHLy5qf3FE3xJig1WKuPirIrLZlItoheaYqvmPPyJXdvGpZm7tSR5Vd1c6lTxJUJf0Ac30fDhSNaNJUSZ6gYsSqUNjImER4YE4BvghRZ2DiODHMyLxTtVGyGZK+zA9veQpIv6uJNrLTqZ6xh3SUZhaWBdMc052VarApINeGgS8kkOVp0NNLdgU5LXqcPnkrK7BFNutRyGQUNFZtWingMZ/Rhzhe3IFP6Py8J2eL+IvM53b9lL3s+nujNLWV9+jqSS6FQkP3frI7LJEoN+0KTa27QsGqg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=garyguo.net; dmarc=pass action=none header.from=garyguo.net; dkim=pass header.d=garyguo.net; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=garyguo.net; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Kzx5qFIUykHljOmd7LUmPjZhL9FahW+74V3kofS+1WY=; b=HUqhjzQd59Z/TCHpM6zo6UXSOlV4UgWpHQACDfrRJo1YqNtcpR0SxHMCv4E4Ff5RowmPg+Aq7goo5eQ8gzZXlfZhWBakzRoCpzYfvN1q1IxSX51ZofXy2Kb4ngmWZxrRPA9hGnkCPAvGTWehKmgb7Nk11DmA6RpP3JCdnKkfw9I= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=garyguo.net; Received: from LOAP265MB8560.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:4ab::19) by CWXP265MB2773.GBRP265.PROD.OUTLOOK.COM (2603:10a6:400:aa::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.360.13; Wed, 2 Sep 2026 22:00:11 +0000 Received: from LOAP265MB8560.GBRP265.PROD.OUTLOOK.COM ([fe80::f60b:1537:68d7:4fc1]) by LOAP265MB8560.GBRP265.PROD.OUTLOOK.COM ([fe80::f60b:1537:68d7:4fc1%4]) with mapi id 15.21.0360.008; Wed, 2 Sep 2026 22:00:11 +0000 From: Gary Guo Date: Wed, 02 Sep 2026 23:00:01 +0100 Subject: [PATCH v2 3/3] rust: doctest: generate Rust kunit test suites Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260902-kunit-v2-3-eda3ed6c00c5@garyguo.net> References: <20260902-kunit-v2-0-eda3ed6c00c5@garyguo.net> In-Reply-To: <20260902-kunit-v2-0-eda3ed6c00c5@garyguo.net> To: Miguel Ojeda , Boqun Feng , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , Daniel Almeida , Tamir Duberstein , Alexandre Courbot , =?utf-8?q?Onur_=C3=96zkan?= , Brendan Higgins , David Gow , Rae Moar Cc: rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, Gary Guo X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1788386408; l=4725; i=gary@garyguo.net; s=20221204; h=from:subject:message-id; bh=uAZWyJ4TqhHSbqxR098SNMt+LnK5fZaIrY9HwZF5H1c=; b=1F1eW5kH7YQffszbSnrfGChOjCKHL1feEnGr9XNWL/keIm+q1V2LB14/NedpRuqCJPymYK3dh qilgkLLSmhYD7kzY45P4WjUwu9ZRBBdShOfXLhGYFStMmGRQhsRiexL X-Developer-Key: i=gary@garyguo.net; a=ed25519; pk=vB3uIX95SM4eVrIqo1DWNWKDKD2xzB+yLLLr0yOPYMo= X-ClientProxiedBy: CWLP265CA0322.GBRP265.PROD.OUTLOOK.COM (2603:10a6:401:57::22) To LOAP265MB8560.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:4ab::19) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: LOAP265MB8560:EE_|CWXP265MB2773:EE_ X-MS-Office365-Filtering-Correlation-Id: 995f0cbd-9f9f-4d83-677d-08df093d8f58 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|23010399003|7416014|10070799003|366016|56012099006|921020|6133799003|10067099003|22082099003|18002099003|3023799007; X-Microsoft-Antispam-Message-Info: gfbjM4FrHGjXbZr+HJ+ifwAi2R4RCsSJdi3CAD2W+EDE4dbO5l/Yw69FzhbDC7HEPlkR7H3Lts+e+GE5vzzHNdSUY/ysXS00t0UTJTjBz5lASvxqQFh0JWNpaDlLCRxWTdqOPazZdPeAFvFZ+WxkF+0iMTQ0LOcGaZTy5j6p5b9dkac70INoOzmh1EYalCSrb1QETxJcmq5lCXAAO15M4ZAVg+o8PuUGEVM78LlQskgkUDPcIPji4fVDE+rFZqULIBXWVQy2ayHWg0zgH5RgjdMFYjAuUnvt4WuIbkZBgIt0rrHdXYfzMNgIiHc3CPOwdW4TfZdMuNUicITtCwgTZpvLG4L/8j0qjM7akKdOBNMcj0YBFRoYknBID8yzcewaMgpGK3JBM2JJ0EZ+N6Oh9g/pLA2YJp63qjYzXeoQ4rddgzk3pcejoyndbJg2ThbjAA/eaZiwNTJTznLFeQ0z86DT0OYkSHpCw3a/nB8LJ6A3YrsOLeqb6Krc5eA03H827V3N6NMS/JUb5huM8Vak30vCO1/knr+ARKeUgQUdJOrGF6QRjdBetQX3nUYuaijrYFQryJOXzdJEMyA8wwMJY7oKgdkhEZSnPXh3NvrftACT5URBUgWQJhWbKgkrXxL77Prk4H6CI3INIQUxf64hnALVgfbimaPasv0PUoX/e8GZuxl0EA2+12GJmdpbUgrYZrfsOJjNQXsEHLEjyBLhxQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:LOAP265MB8560.GBRP265.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230040)(376014)(1800799024)(23010399003)(7416014)(10070799003)(366016)(56012099006)(921020)(6133799003)(10067099003)(22082099003)(18002099003)(3023799007);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?ZUxaK0ducnZmMHIvREtNazdUWkQ2dC9xczBsRXdZU09hckJJalkzRUt4eUxP?= =?utf-8?B?RHMrYXMvM3pyTFVodVJMZ3lhelg1QlByVDQyQmNrVGxUSFZJaERiUVF5dDlh?= =?utf-8?B?RHREMExzeHFnS1pxZkZmd1IrQVZaRE1OeWg4OWMxV0JMcSt1NStCQnovYlV2?= =?utf-8?B?c3RnTmgvOUhUcW5mSDNKOFpGcGRSVGkzOExxRnVUblh6eURMTHI5ZUNmT0lN?= =?utf-8?B?RzNSb2o2bmhQUmRIZzIzQk9ZY2NGVjJHV2xzSFZSYXh0TDZrMlFUYTVMZ1Vw?= =?utf-8?B?WTFkaDdkZzIwc3RRYWt3d0RxM0xvOGowSkhTZzJHelhoM0hQYkFacGo3K2J4?= =?utf-8?B?UzRWdllwM2wxck5rb1czTGlDTjZHL3NaamxnRjNsNE9acUh4N2VZNFB2TzQr?= =?utf-8?B?M2pUR1krRytudnhDS2lMNmxLZGg4N05EajllOXhsek1vd1BZaWxkbmI1RVd0?= =?utf-8?B?cVVhQ2x3Q3lNYU50UzQ1ajB2MDFmazZDd3JnRWdyOW1uUXB2Z1I1OGZmNDBQ?= =?utf-8?B?bm5UU3I1cDg4YkwvL0lJRDYxRWM5YjQvZkw2TkNRSXF5WU55SW84WXZSZnJ6?= =?utf-8?B?dGl6NVFDZzJUQ0FOTzdRdVE3S0dFZWN0Vjl2b1A3bW4zVW9Kd3ZXcjlMQnkr?= =?utf-8?B?RkNleW8ybkxOZ2ViTzRsR0FMZm8zRWE3cktFS24zS0RjMitQWVBoRWZWM2R3?= =?utf-8?B?YUVKZm84ZnBIUXRPMWhtaDJmQjQ1bTBCNHpMUk9LclZtVmJMeDdJRjBkSy9L?= =?utf-8?B?QXlLOHpzSDJmbnR6R2V1a2R4eS9FQXVBUGJENnRwWlU4ZWlVTTNSN05pZXNv?= =?utf-8?B?czZ2UzF6TFBuem0ydUJzK0oxQUxIVWMxK05mRTYrNlZJSmdJU3Y2blZMSTNv?= =?utf-8?B?Q2hRdDFqL3oyaVZCK08rSkRkS0tkbnZCamx3eExvd3FrTkNJWURqYnd0RldJ?= =?utf-8?B?NjMrRXE3bGVPRG1lWlZ4WmZSK2EvSjdTcFdLYTJzQmczZ2t6NGZ2aVltMGV5?= =?utf-8?B?dzJ2aURZRGNnSW5BejJpZFJncDhKTlExampaekdvWHZiTkRJeks3SWRwdlJr?= =?utf-8?B?MFBybEQ2N1ZJQy96YkZKZ0cvTGE3ZE1JdzRyZkdpRk1SL3JvNWxrL2tsd2hR?= =?utf-8?B?S1lwbkdJTnN5clg2WmtPOWdvWTU5eERSdFVjV2NOY2huUnYzRG9xS0NvVlIy?= =?utf-8?B?QnpNWFR0R2FDN0VnekVkS1NScms4TkMra1hiZ25XU1NrVDJlZ3NmdCt0ZXNm?= =?utf-8?B?NXZVMjAwdVZGNm03eDhpQkFwQVg4OEllY1d4dlh3V1lyc3ZxbzdnLy8vSkh5?= =?utf-8?B?SHhjVVRXVWE2VlpQR2dNL0JVVTNWQVg1ZzYzR3NjWVUzRHV5YVhEVXpjbklw?= =?utf-8?B?SE9hS1A4RnkwSHZPbFdMUitNRFdIdTRwbTlEQlRITnF4NHI4SGNZMHZhNi9Z?= =?utf-8?B?VEpiL2NOZ2RNZVZZeWxCTDI4c1J4SVRxYTRkRWI2UUREMHJyRTBvWjNKdERR?= =?utf-8?B?R2thYVNQMzNZU3h5RGcrcjdPOUJNakNGM1IwajFvUDFjZlBBTnZJWVh0cm1u?= =?utf-8?B?eXZtNGpiZkphN1FtbkJ5Q2Y5RW5Icko0M0NUNVp6eSs5dHFwZ1NTZ3RGSjh3?= =?utf-8?B?S3pEdE5SOFlKVFRLVDkwaTYyOVdkckR0SHF3bVRxUlRQWWxacUpCczEreVA1?= =?utf-8?B?d0ZoVnFRZlNseEFMT2Y0K01kZ3R2VlRyUC93WlFVZnMvc3RXdzVNSzhvME5j?= =?utf-8?B?VXpqNjBHRlowRGtJbzE1NWYwWVkxN2xkUXl5ZVROKzVaUXphUFBrVVh5Y29Y?= =?utf-8?B?OHZsdHFUY0Izamk5bDZaanJjSkM2N0MzZW1Zc2ViejZKRjRDcnlFOVorSXRQ?= =?utf-8?B?d1B4VU1uWFpIZUY3TEEyQStOYlo4VUlITlR0OFZwaUh0QlMxcXZsR253ZHJJ?= =?utf-8?B?UDBiS2MwN1ZOekZyNDNycit4RGdQWUJtNFJvcHc1bFZQdW52VUM0WUc5Tkpz?= =?utf-8?B?L0VPRW5KTGRUVVlXZWJoVExmNExNc3ZqQXUvQVRzRFVUdUZ5NW9rZG9CK2hy?= =?utf-8?B?NnVtbGcyTUp4c01DdG9rcmR3ODNKTEEvbnlsLzhid0RvVndxNi94ODhyNkx4?= =?utf-8?B?KytqZGNobVkybnhXM2xXMzdWeGJJRXhENUdBcHBjSzF6cENOSUJUclZCOVlE?= =?utf-8?B?VldrWVZBSi9VbVF0UWNrekorbHI4WE5ESm52UGJrQzMyejQxQ3lWOXFDdi9H?= =?utf-8?B?Tkl5UEhHN0k0azcrRElwQXdHY0d5R0RVLzlFOE91RmRSejFPRmgvUnJaNE44?= =?utf-8?B?RGNiU3d3M0hVWVNJQWV2QU1ZM3JmYnZTR29SY3BlWlNGWW9vVGptUT09?= X-OriginatorOrg: garyguo.net X-MS-Exchange-CrossTenant-Network-Message-Id: 995f0cbd-9f9f-4d83-677d-08df093d8f58 X-MS-Exchange-CrossTenant-AuthSource: LOAP265MB8560.GBRP265.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Sep 2026 22:00:11.3003 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: bbc898ad-b10f-4e10-8552-d9377b823d45 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: gUHW41BC78/70cSuPv6jTBHbgaHvaFi6Su3RLSakM+Th3BEC+1R4AuNc+UEeOEZXlitS7FVpqHPi2bjvkwaMYA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CWXP265MB2773 For doctest, instead of generating C FFI functions, generate a Rust test suite with `#[kunit_tests]` and `#[test]` attributes. This makes the C glue no longer needed. Reviewed-by: David Gow Signed-off-by: Gary Guo --- rust/Makefile | 4 +-- scripts/rustdoc_test_gen.rs | 69 ++++++-----------------------------------= ---- 2 files changed, 10 insertions(+), 63 deletions(-) diff --git a/rust/Makefile b/rust/Makefile index da1a7409d984..ec8c08ee3263 100644 --- a/rust/Makefile +++ b/rust/Makefile @@ -39,10 +39,8 @@ obj-$(CONFIG_RUST) +=3D exports.o always-$(CONFIG_RUST) +=3D host/libproc_macro2.rlib host/libquote.rlib hos= t/libsyn.rlib =20 always-$(CONFIG_RUST_KERNEL_DOCTESTS) +=3D doctests_kernel_generated.rs -always-$(CONFIG_RUST_KERNEL_DOCTESTS) +=3D doctests_kernel_generated_kunit= .c =20 obj-$(CONFIG_RUST_KERNEL_DOCTESTS) +=3D doctests_kernel_generated.o -obj-$(CONFIG_RUST_KERNEL_DOCTESTS) +=3D doctests_kernel_generated_kunit.o =20 always-$(subst y,$(CONFIG_RUST),$(CONFIG_JUMP_LABEL)) +=3D kernel/generate= d_arch_static_branch_asm.rs ifndef CONFIG_UML @@ -400,7 +398,7 @@ quiet_cmd_rustdoc_test_kernel =3D RUSTDOC TK $< $< $(rustdoc_test_kernel_quiet); \ $(objtree)/scripts/rustdoc_test_gen =20 -%/doctests_kernel_generated.rs %/doctests_kernel_generated_kunit.c: \ +%/doctests_kernel_generated.rs: \ $(src)/kernel/lib.rs $(obj)/kernel.o \ $(objtree)/scripts/rustdoc_test_builder \ $(objtree)/scripts/rustdoc_test_gen FORCE diff --git a/scripts/rustdoc_test_gen.rs b/scripts/rustdoc_test_gen.rs index bb870f83dde2..068ecdb0845d 100644 --- a/scripts/rustdoc_test_gen.rs +++ b/scripts/rustdoc_test_gen.rs @@ -125,9 +125,7 @@ fn main() { // Sort paths. paths.sort(); =20 - let mut rust_tests =3D String::new(); - let mut c_test_declarations =3D String::new(); - let mut c_test_cases =3D String::new(); + let mut tests =3D String::new(); let mut body =3D String::new(); let mut last_file =3D String::new(); let mut number =3D 0; @@ -172,10 +170,10 @@ fn main() { =20 use std::fmt::Write; write!( - rust_tests, + tests, r#"/// Generated `{name}` KUnit test case from a Rust document= ation test. -#[no_mangle] -pub extern "C" fn {kunit_name}(__kunit_test: *mut ::kernel::bindings::kuni= t) {{ +#[test] +fn {kunit_name}() {{ // Overrides the usual [`file!`] macro with one that expands to the re= al path. #[allow(unused)] macro_rules! file {{ @@ -190,26 +188,6 @@ macro_rules! line {{ () =3D> {{ const {{ ::core::line!() - __DOCTEST_ANCHOR + {line} }}= }} }} =20 - /// Overrides the usual [`assert!`] macro with one that calls KUnit in= stead. - #[allow(unused)] - macro_rules! assert {{ - ($cond:expr $(,)?) =3D> {{{{ - ::kernel::kunit_assert!( - "{kunit_name}", $cond - ); - }}}} - }} - - /// Overrides the usual [`assert_eq!`] macro with one that calls KUnit= instead. - #[allow(unused)] - macro_rules! assert_eq {{ - ($left:expr, $right:expr $(,)?) =3D> {{{{ - ::kernel::kunit_assert_eq!( - "{kunit_name}", $left, $right - ); - }}}} - }} - // Many tests need the prelude, so provide it by default. #[allow(unused)] use ::kernel::prelude::*; @@ -238,14 +216,9 @@ macro_rules! assert_eq {{ "# ) .unwrap(); - - write!(c_test_declarations, "void {kunit_name}(struct kunit *);\n"= ).unwrap(); - write!(c_test_cases, " KUNIT_CASE({kunit_name}),\n").unwrap(); } =20 - let rust_tests =3D rust_tests.trim(); - let c_test_declarations =3D c_test_declarations.trim(); - let c_test_cases =3D c_test_cases.trim(); + let tests =3D tests.trim(); =20 write!( BufWriter::new(File::create("rust/doctests_kernel_generated.rs").u= nwrap()), @@ -271,34 +244,10 @@ impl ModuleMetadata for LocalModule {{ }}; }} =20 -{rust_tests} -"# - ) - .unwrap(); - - write!( - BufWriter::new(File::create("rust/doctests_kernel_generated_kunit.= c").unwrap()), - r#"/* - * `kernel` crate documentation tests. - */ - -#include - -{c_test_declarations} - -static struct kunit_case test_cases[] =3D {{ - {c_test_cases} - {{ }} -}}; - -static struct kunit_suite test_suite =3D {{ - .name =3D "rust_doctests_kernel", - .test_cases =3D test_cases, -}}; - -kunit_test_suite(test_suite); - -MODULE_LICENSE("GPL"); +#[kernel::macros::kunit_tests(rust_doctests_kernel)] +mod tests {{ +{tests} +}} "# ) .unwrap(); --=20 2.54.0