From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 27A6346C4D for ; Wed, 30 Jul 2025 09:12:11 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1DF1140E2D; Wed, 30 Jul 2025 09:12:11 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2071.outbound.protection.outlook.com [40.107.237.71]) by mails.dpdk.org (Postfix) with ESMTP id 1F21540E2A for ; Wed, 30 Jul 2025 09:12:10 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=rflbhVf2eUjpQPIXb3ikkkuQHb51FbMbqj9mRJiWfPe5aPR84ckA57f2Ku2XmZEIZZRc1CIXyMIfsNqqL/ZuFBQRG9Y4RjgELBldRJLn/XXeXtoZry63k5jNNx017jCTOkTldFR6Re7Wr2uOQUdBIDY1mFgbHcf5JQQpDG9/oFYr3RTIURe695cMsjRAlUOgdrcggrdUGwuOvdWRfdCpmOvJF9o4pd5NRL6ZXzGTTJI99bMhErmvtd2H6LUv5RevNTyP+aFodx3PPumQeGEnGcsYoOwC9zIA6qIbMvfy7hUhbLzdgF1hRfxos/NESQu2m7x2H63gVQ+++pgIu4isMg== 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=X3BE9k5al52ZheO2YPS5GFt1K0cyEFW0LouO+hHM1B0=; b=H6ehOZ8BB5NwhYNF79bzNuFNcchXLpoWRvfPyKV72uPYc55VKDwMKeA0ePjQd5qys563IHxvy1DWFQcIuEU//Z6mCC7RF2sIIsExhkPGDvl/fAri+f9At95tqRWaEKLHsYRZU1WidxGizHnu487XtuE0OYP6xrOhL35n3qSa8B0WhyEzRIGrY9lbw/LVpGu/qWw6BpQt1r+pEVGsXiq8qJ1hF0v0HnB7BqgmiJrfnHM87noYjGF6vhjwZtXqwBb+PCTakny0c/zXfGWYPw3N0sw7Kj8Z9b7X603S9S7wfXstGPzRTGx53wM1ym7HaaE7J99iw7e4v/qHaRznmT99fQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=huawei.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=X3BE9k5al52ZheO2YPS5GFt1K0cyEFW0LouO+hHM1B0=; b=ZTigkHwiJ/jb89E53jdf3GgDwwgEI81LH7qw/BbnT/pR99TogzrewWV8xijq1KudlCyGh7o5zcXCpLIwl9wie28PCzzlnQTDlrSNRcyK1kmo3+jPcoSfOK0YDxf80xcqON17s/xQuPUrzF8C4oNbI6Lexnk/xGf+XcZdrAgb00ng5X2BGyuGWGmi/0zU3bpBm1ZNXiaeKeGOGXOc1zDqkVns0SwkLvFjpCKRPiybAsYjBZhxPPi/WfHL+vqCLLd5VJaqneRkxdGE0OtBjkDLp8cpYttOu7xrdcKeofuUeOPLzkHmwK0NGR7euGIgj2wTX+OppcEkGTFeFdvRet0F4Q== Received: from SJ0PR03CA0133.namprd03.prod.outlook.com (2603:10b6:a03:33c::18) by SJ5PPFF6E64BC2C.namprd12.prod.outlook.com (2603:10b6:a0f:fc02::9aa) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8722.33; Wed, 30 Jul 2025 07:12:05 +0000 Received: from CY4PEPF0000EE3C.namprd03.prod.outlook.com (2603:10b6:a03:33c:cafe::e5) by SJ0PR03CA0133.outlook.office365.com (2603:10b6:a03:33c::18) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8964.27 via Frontend Transport; Wed, 30 Jul 2025 07:12:05 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by CY4PEPF0000EE3C.mail.protection.outlook.com (10.167.242.13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8989.10 via Frontend Transport; Wed, 30 Jul 2025 07:12:02 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Wed, 30 Jul 2025 00:11:42 -0700 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Wed, 30 Jul 2025 00:11:38 -0700 From: Xueming Li To: Marat Khalili CC: Xueming Li , dpdk stable Subject: patch 'buildtools/test: scan muti-line registrations' has been queued to stable release 23.11.5 Date: Wed, 30 Jul 2025 15:10:18 +0800 Message-ID: <20250730071045.136672-8-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250730071045.136672-1-xuemingl@nvidia.com> References: <20250626120145.27369-1-xuemingl@nvidia.com> <20250730071045.136672-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CY4PEPF0000EE3C:EE_|SJ5PPFF6E64BC2C:EE_ X-MS-Office365-Filtering-Correlation-Id: e0495851-08c9-492f-60a0-08ddcf3862da X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|1800799024|82310400026|36860700013|376014|13003099007|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?0P0otyYeJ5IoGXLp4zONVpnIdkZTtmpQpLxYe+RfyqjVNWcBEpKCOmKh0DqZ?= =?us-ascii?Q?ohTh6OD9eVxQloc7nhkixozdhGqnHcDCIXh8SNRKo0woenu7AYij4orY11Cp?= =?us-ascii?Q?rfqFK3stlskDJfU2jARS194/yn9xL8LNEetFe91UmDFwYbALgflAMsrGnBSK?= =?us-ascii?Q?fzMe6BldwuKDCUosmqKN794xz1+ZGEdbvjaDYXlQjaYI5N1TGiwH92xxioLs?= =?us-ascii?Q?oZLBN7m2Uu36Gpj1xyPBk8klr+BvOEcIZxnCIil9fUX2Ei8f59hBb4Fo6yny?= =?us-ascii?Q?WvLYLWCjLD2HO2wsenvY00pWchqRNdxECe8xiC6NJvpRkfb6fMpjtcfE9QZk?= =?us-ascii?Q?NFUmHuPqSgdR2PwsJr92K3fR2z/SG9ZllX7dD/nQ82KeAJlQ1LqYQG/vzlDV?= =?us-ascii?Q?BXoFcApWmghdr9Ce0nkR/yk6bhXRC1Whe52yNCfEBGWqhyVeTCrv7/PqUvTR?= =?us-ascii?Q?aEUoPj1mvflPf4JZShFKDS5fRl9h63ci9G91AP5GbLTTfhKLHpjvqQrfp52E?= =?us-ascii?Q?8Qap5IbeOWRBY/i6vAv/LyQF/Ds121N6rqW/p6H/8L6tfwEepLkiz+OtjZu5?= =?us-ascii?Q?IMZtZl+M0V2OdhHOyNxjG4i/LEtWZ6I8XIuVEJ8q1cpAnLeO+xkscsn3jq8d?= =?us-ascii?Q?4CBsIEb1PrQH7oCzjlfMyOtZ8cH11ncPwTUTI2F8tnyCoY1aAMQEHO6XXjQy?= =?us-ascii?Q?slXADBZXSq46IypTBeOKqWNRShx1uviToLmfoPD1zM/EyJdXZ2/LrMDDV+wI?= =?us-ascii?Q?2bOxPpddM3PEIq3Z7yQ5cp9m3v+qiNcYTw0weWBCWBlnoLR13O2azMnK7OEw?= =?us-ascii?Q?/yuUTpqiqoNYEA3jNpdaagyaNG89jyYccAr3SMmXeF+t9VLc98AUeW/pCnjP?= =?us-ascii?Q?dT5S7uFhhxrb5KTcMOUrE0WnJqYTjxyfZU07J6aJbDiyLqKdJKdrM4mMmcWR?= =?us-ascii?Q?Ma04bBc5XvzlJbhHuW74nsl08lI2ESfFy4EdBqF7/cB0OyA8anVWAZpTRAbp?= =?us-ascii?Q?7ZB1SSvQTr2VKa26KdItL2IHzgeeyEScHsZErz1gw7vzoRBxm2igHytsPo6K?= =?us-ascii?Q?zvg2y3n+f5cXN3FC3bADRkY1WqAEKFoVNWdR/NKrSV3dNpV4kzbkAMlFnVQN?= =?us-ascii?Q?6pWSNbMQBxBYSE1bLoBkRruWk7Y1TSzj5otbdnK30AljQJfh5Epv5spRHewX?= =?us-ascii?Q?l0fecdISkFo6yTNKri4dekznQv1iSXW7DtChRzNlPS+8E5t/WtGKKuek8ul0?= =?us-ascii?Q?MEkKXX7Rn3dwENrycKBcUFnUGuSb7J90wmDwXQkHcH8D+pe1JwWgJZpQ91xD?= =?us-ascii?Q?IIhlXVlCDDmSsAUe9Wv3fOZv/6AO2qLxy1cCnmJzoKEpNeQjekD1g6+o/m28?= =?us-ascii?Q?8OBTRMzySrzN9Mf11hJ9YmYnTr24FfkP8teEsuYZz6TgMFUyDM1Be5nkCJFE?= =?us-ascii?Q?CYFtiSoaIti2PmhkuxCpFwds3LIyn1LA3taEhyQWjpuvMUXBF1oYfYYKZhGi?= =?us-ascii?Q?rPlwpVLDQLQcxVK+RNU1cCR0/RoPUyppRoeD?= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230040)(1800799024)(82310400026)(36860700013)(376014)(13003099007)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Jul 2025 07:12:02.7668 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e0495851-08c9-492f-60a0-08ddcf3862da X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CY4PEPF0000EE3C.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ5PPFF6E64BC2C X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 23.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 08/10/25. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=49f854ce6d8b228be864cdff1c66502e9760d9b5 Thanks. Xueming Li --- >From 49f854ce6d8b228be864cdff1c66502e9760d9b5 Mon Sep 17 00:00:00 2001 From: Marat Khalili Date: Wed, 18 Jun 2025 13:39:46 +0100 Subject: [PATCH] buildtools/test: scan muti-line registrations Cc: Xueming Li [ upstream commit 778688b445e1d42e2e30cca29c0301dc94f32af5 ] Test list is currently generated by scanning all files for macros starting with `REGISTER_` and ending with `_TEST`. Unfortunately, this was done line-by-line, and macros split into several lines were silently ignored resulting in tests being excluded from test suites without any warning. Make regular expression multiline, capturing everything until the closing parenthesis. (There should be no nested parentheses due to the nature of the arguments these macros accept.) The rest of the functionality stays the same. The result was manually compared to be identical to the previous version. Fixes: 0aeaf75df879 ("test: define unit tests suites based on test types") Signed-off-by: Marat Khalili --- buildtools/get-test-suites.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/buildtools/get-test-suites.py b/buildtools/get-test-suites.py index fd22d25f36..c3a99a862e 100644 --- a/buildtools/get-test-suites.py +++ b/buildtools/get-test-suites.py @@ -6,10 +6,12 @@ import sys import re input_list = sys.argv[1:] -test_def_regex = re.compile(r"REGISTER_([A-Z]+)_TEST\s*\(\s*([a-z0-9_]+)") +test_def_regex = re.compile( + r"^\s*REGISTER_([A-Z]+)_TEST\s*\(\s*([a-z0-9_]+)[^)]*\)", re.MULTILINE) test_suites = {} # track tests not in any test suite. -non_suite_regex = re.compile(r"REGISTER_TEST_COMMAND\s*\(\s*([a-z0-9_]+)") +non_suite_regex = re.compile( + r"^\s*REGISTER_TEST_COMMAND\s*\(\s*([a-z0-9_]+)[^)]*\)", re.MULTILINE) non_suite_tests = [] def get_fast_test_params(test_name, ln): @@ -20,19 +22,19 @@ def get_fast_test_params(test_name, ln): for fname in input_list: with open(fname, "r", encoding="utf-8") as f: - contents = [ln.strip() for ln in f.readlines()] - test_lines = [ln for ln in contents if test_def_regex.match(ln)] - non_suite_tests.extend([non_suite_regex.match(ln).group(1) - for ln in contents if non_suite_regex.match(ln)]) - for ln in test_lines: - (test_suite, test_name) = test_def_regex.match(ln).group(1, 2) + contents = f.read() + non_suite_tests.extend( + match.group(1) for match in non_suite_regex.finditer(contents)) + for match in test_def_regex.finditer(contents): + (test_suite, test_name) = match.group(1, 2) suite_name = f"{test_suite.lower()}-tests" if suite_name in test_suites: test_suites[suite_name].append(test_name) else: test_suites[suite_name] = [test_name] if suite_name == "fast-tests": - test_suites["fast-tests"][-1] += get_fast_test_params(test_name, ln) + test_suites["fast-tests"][-1] += get_fast_test_params( + test_name, match.group(0)) for suite in test_suites.keys(): print(f"{suite}={','.join(test_suites[suite])}") -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-07-30 15:02:13.047698168 +0800 +++ 0007-buildtools-test-scan-muti-line-registrations.patch 2025-07-30 15:02:12.771184135 +0800 @@ -1 +1 @@ -From 778688b445e1d42e2e30cca29c0301dc94f32af5 Mon Sep 17 00:00:00 2001 +From 49f854ce6d8b228be864cdff1c66502e9760d9b5 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 778688b445e1d42e2e30cca29c0301dc94f32af5 ] @@ -20 +22,0 @@ -Cc: stable@dpdk.org