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 5AAA543D47 for ; Mon, 25 Mar 2024 13:08:48 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5500E40A80; Mon, 25 Mar 2024 13:08:48 +0100 (CET) Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mails.dpdk.org (Postfix) with ESMTP id 44E3840A79 for ; Mon, 25 Mar 2024 13:08:46 +0100 (CET) Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-33ec7e1d542so2988342f8f.1 for ; Mon, 25 Mar 2024 05:08:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711368526; x=1711973326; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xs0N8Kv5OEcFq8IEaEN5I/9YH5GV9+RwO4hcKWdC9vs=; b=HEO5x8843RK4PcseyQKXMpQsRNgAqJgqnan4pHPcTMxc4q8P94zpUzM55uRV2I8vsJ zFxhCoXp99QmAV77+osToul/W1tqGeNMCAt8JWm1LMCxwDUi6UQ5AvWKsqhHc2wnSgZ3 DSD2udKGRj25nWbXKT/un0/KpwsRUsFqc1/T8qgLr27irETesz3KesI/jRGzTXtNYxEY C7HWuV4xOKbw9COYWdfO75/dhUf2tsG9/kTSkrSxdf2mVO6KqNz5sg3xx44sa+/L5ylm 8dsCcLoXtrLK2VD69p4htVZUwKtyQwT6Q6tD2JidznhI0xydpcqD1A1GO6PbH2QgDydn e2KA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711368526; x=1711973326; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xs0N8Kv5OEcFq8IEaEN5I/9YH5GV9+RwO4hcKWdC9vs=; b=ctOaIT6O62bXlFifKtVnUq4m5K3LVsNq5PDuRNwVPXMRcCyBqmVlkCY4J7fK54WDEY KZLyuzmM2JtwTss5ecv8FcBaNOQ4TLrogD4xAJQE+gmLofzmxt++wf6MzgCdJ8l7S4Sl kNu/BbO7Retf59uJKAaFtP0SaIILY2YSwWgSHnCB3pBbRbD47RQbigxt2wonevm3WdKH maBXtrGrXpl/X4u6fYLxVUD7NrbJy9Ex4kS01HJ+/zstcv6stRZ3PCxkWEfyrrdLy+hF PSm9FyujPfmkp2zQfePJKidkWfkNGmCh1lORBFrukZ58s1R5mRiQeNP/4W0J/Bkkm6iC Mu3w== X-Forwarded-Encrypted: i=1; AJvYcCVt+3SiRhzDuYtMBmG1UaSaFbMAFbMwKX4hZYEpyijQH5/tQgm6Ao8iE6KIHngJU1j1mfZTXiTBHf+ojsYqSWE= X-Gm-Message-State: AOJu0YySAx6+1dugW/5XJCAlFlbEuext8F1h69OGDRw+kiTbjUJx10PV 0duY8NYopAp8ibze5ZWDE1JDt0jo7aVKXgsTY1yLsQQ5cMliBKNK43wHmrJX X-Google-Smtp-Source: AGHT+IEpIYch8kSmfPYkbxdw2AvZ0Y9WM6X5QVAR1UP862Z0x0rrGFby8AISJU5i+53SonE/0NywOQ== X-Received: by 2002:a5d:5cc6:0:b0:33e:c522:a071 with SMTP id cg6-20020a5d5cc6000000b0033ec522a071mr4666651wrb.51.1711368525911; Mon, 25 Mar 2024 05:08:45 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:7aef:1aaa:3dff:d546]) by smtp.gmail.com with ESMTPSA id df4-20020a5d5b84000000b0033e7b433498sm9375713wrb.111.2024.03.25.05.08.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Mar 2024 05:08:45 -0700 (PDT) From: luca.boccassi@gmail.com To: Holly Nichols Cc: Vinh Tran , Thomas Monjalon , dpdk stable Subject: patch 'test/cfgfile: fix typo in error messages' has been queued to stable release 22.11.5 Date: Mon, 25 Mar 2024 12:08:23 +0000 Message-Id: <20240325120824.1104729-8-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240325120824.1104729-1-luca.boccassi@gmail.com> References: <20240318153919.3407921-28-luca.boccassi@gmail.com> <20240325120824.1104729-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 22.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 03/27/24. 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://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/8a9e1d1f86ea2996b742e70e742ec204945b27a9 Thanks. Luca Boccassi --- >From 8a9e1d1f86ea2996b742e70e742ec204945b27a9 Mon Sep 17 00:00:00 2001 From: Holly Nichols Date: Thu, 21 Mar 2024 19:05:29 -0400 Subject: [PATCH] test/cfgfile: fix typo in error messages [ upstream commit fbca1ad85f7725b876d032cb732b3332d247e1f4 ] Caught by codespell. Fixes: c54e7234bc9e ("test/cfgfile: add basic unit tests") Signed-off-by: Holly Nichols Signed-off-by: Vinh Tran Signed-off-by: Thomas Monjalon --- .mailmap | 2 ++ app/test/test_cfgfile.c | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.mailmap b/.mailmap index a6992311ba..918e959344 100644 --- a/.mailmap +++ b/.mailmap @@ -506,6 +506,7 @@ Hideyuki Yamashita Hiroki Shirokura Hiroshi Shimamoto Hiroyuki Mikita +Holly Nichols Hongbo Zheng Hongjun Ni Hongzhi Guo @@ -1438,6 +1439,7 @@ Vincent Guo Vincent Jardin Vincent Li Vincent S. Cojot +Vinh Tran Vipin Varghese Vipul Ashri Visa Hankala diff --git a/app/test/test_cfgfile.c b/app/test/test_cfgfile.c index 2f596affee..a5e3d8699c 100644 --- a/app/test/test_cfgfile.c +++ b/app/test/test_cfgfile.c @@ -168,7 +168,7 @@ test_cfgfile_invalid_section_header(void) struct rte_cfgfile *cfgfile; cfgfile = rte_cfgfile_load(CFG_FILES_ETC "/invalid_section.ini", 0); - TEST_ASSERT_NULL(cfgfile, "Expected failured did not occur"); + TEST_ASSERT_NULL(cfgfile, "Expected failure did not occur"); return 0; } @@ -185,7 +185,7 @@ test_cfgfile_invalid_comment(void) cfgfile = rte_cfgfile_load_with_params(CFG_FILES_ETC "/sample2.ini", 0, ¶ms); - TEST_ASSERT_NULL(cfgfile, "Expected failured did not occur"); + TEST_ASSERT_NULL(cfgfile, "Expected failure did not occur"); return 0; } @@ -196,7 +196,7 @@ test_cfgfile_invalid_key_value_pair(void) struct rte_cfgfile *cfgfile; cfgfile = rte_cfgfile_load(CFG_FILES_ETC "/empty_key_value.ini", 0); - TEST_ASSERT_NULL(cfgfile, "Expected failured did not occur"); + TEST_ASSERT_NULL(cfgfile, "Expected failure did not occur"); return 0; } @@ -236,7 +236,7 @@ test_cfgfile_missing_section(void) struct rte_cfgfile *cfgfile; cfgfile = rte_cfgfile_load(CFG_FILES_ETC "/missing_section.ini", 0); - TEST_ASSERT_NULL(cfgfile, "Expected failured did not occur"); + TEST_ASSERT_NULL(cfgfile, "Expected failure did not occur"); return 0; } -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-25 11:28:37.803738780 +0000 +++ 0008-test-cfgfile-fix-typo-in-error-messages.patch 2024-03-25 11:28:37.212389359 +0000 @@ -1 +1 @@ -From fbca1ad85f7725b876d032cb732b3332d247e1f4 Mon Sep 17 00:00:00 2001 +From 8a9e1d1f86ea2996b742e70e742ec204945b27a9 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit fbca1ad85f7725b876d032cb732b3332d247e1f4 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 6bb0855236..f3a25a7402 100644 +index a6992311ba..918e959344 100644 @@ -23 +24 @@ -@@ -528,6 +528,7 @@ Hiral Shah +@@ -506,6 +506,7 @@ Hideyuki Yamashita @@ -31 +32 @@ -@@ -1513,6 +1514,7 @@ Vincent Guo +@@ -1438,6 +1439,7 @@ Vincent Guo