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 7B49A43DF8 for ; Thu, 4 Apr 2024 11:52:50 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 761C34069F; Thu, 4 Apr 2024 11:52:50 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 66ACA40696 for ; Thu, 4 Apr 2024 11:52:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1712224369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BmW/eE04+cLoXl5/fdw61KvarvoHmHCJt6N0N0cDWYE=; b=SDUNxDK902MpP2wTCCF0rul0pU31NPZDMh65tm1KQjoirlUgvkpG8ck2zZslLvRLoxYvNs DBNS77N04eoQtsCvuHu+27Vcm/7Y3fzytjcX3c4z+hsbhSoh5M5tZ1c78UrqkvNaZlLs0U KaqEI+d3FUTsL0rgyBCayYiey2frf24= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-404-JaxNTyGCMgW9x8wM2Tbg7w-1; Thu, 04 Apr 2024 05:52:43 -0400 X-MC-Unique: JaxNTyGCMgW9x8wM2Tbg7w-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8F88F101A521; Thu, 4 Apr 2024 09:52:43 +0000 (UTC) Received: from rh.Home (unknown [10.39.192.22]) by smtp.corp.redhat.com (Postfix) with ESMTP id AEA7B3C24; Thu, 4 Apr 2024 09:52:42 +0000 (UTC) From: Kevin Traynor 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 21.11.7 Date: Thu, 4 Apr 2024 10:51:49 +0100 Message-ID: <20240404095155.155427-19-ktraynor@redhat.com> In-Reply-To: <20240404095155.155427-1-ktraynor@redhat.com> References: <20240404095155.155427-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/09/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/c6ab7f724167b5530314e2607312aa3d056f8b9d Thanks. Kevin --- >From c6ab7f724167b5530314e2607312aa3d056f8b9d 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 3851a80bbf..055e44f239 100644 --- a/.mailmap +++ b/.mailmap @@ -506,4 +506,5 @@ Hiroki Shirokura Hiroshi Shimamoto Hiroyuki Mikita +Holly Nichols Hongbo Zheng Hongjun Ni @@ -1440,4 +1441,5 @@ Vincent Jardin Vincent Li Vincent S. Cojot +Vinh Tran Vipin Varghese Vipul Ashri 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 @@ -169,5 +169,5 @@ test_cfgfile_invalid_section_header(void) 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; @@ -186,5 +186,5 @@ 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; @@ -197,5 +197,5 @@ test_cfgfile_invalid_key_value_pair(void) 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; @@ -237,5 +237,5 @@ test_cfgfile_missing_section(void) 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.44.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-04-04 10:49:34.483347668 +0100 +++ 0019-test-cfgfile-fix-typo-in-error-messages.patch 2024-04-04 10:49:33.765457777 +0100 @@ -1 +1 @@ -From fbca1ad85f7725b876d032cb732b3332d247e1f4 Mon Sep 17 00:00:00 2001 +From c6ab7f724167b5530314e2607312aa3d056f8b9d 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 3851a80bbf..055e44f239 100644 @@ -23 +24 @@ -@@ -529,4 +529,5 @@ Hiroki Shirokura +@@ -506,4 +506,5 @@ Hiroki Shirokura @@ -29 +30 @@ -@@ -1514,4 +1515,5 @@ Vincent Jardin +@@ -1440,4 +1441,5 @@ Vincent Jardin