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 B3B0442850 for ; Thu, 30 Mar 2023 10:36:15 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B065E42B7E; Thu, 30 Mar 2023 10:36:15 +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 EE91640E25 for ; Thu, 30 Mar 2023 10:36:12 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1680165372; 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=aIefnFMzcnGHrkhAAlIIz9OUf8kWYsM6SaL9dWMiCBo=; b=bqRfp/hXhYSojlNP4bo+RXBaB23QpNUFrmkP5N6RmM92JT010c92lDrBD9OIeUqML6Z35P F6HDidmxsPjYuESCUHM+VPofkJiA6sfNRA7O1oSVaSrFtQh1l+G1Pl106zj5AgNW3j3n62 lk4T76k++oHhC2f9OmAAFQnkX23YD+U= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-652--qUChtxGM52BRXjjXVNiOQ-1; Thu, 30 Mar 2023 04:36:09 -0400 X-MC-Unique: -qUChtxGM52BRXjjXVNiOQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E55F9884342; Thu, 30 Mar 2023 08:36:08 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.23]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3733740521FD; Thu, 30 Mar 2023 08:36:08 +0000 (UTC) From: Kevin Traynor To: Saoirse O'Donovan Cc: Ciara Power , dpdk stable Subject: patch 'test/crypto: fix statistics error messages' has been queued to stable release 21.11.4 Date: Thu, 30 Mar 2023 09:35:57 +0100 Message-Id: <20230330083600.473876-5-ktraynor@redhat.com> In-Reply-To: <20230330083600.473876-1-ktraynor@redhat.com> References: <20230330083600.473876-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.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.4 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/02/23. 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/57915a44ed68f9fb9141a37de495148dbb7ced44 Thanks. Kevin --- >From 57915a44ed68f9fb9141a37de495148dbb7ced44 Mon Sep 17 00:00:00 2001 From: Saoirse O'Donovan Date: Mon, 20 Mar 2023 09:29:56 +0000 Subject: [PATCH] test/crypto: fix statistics error messages [ upstream commit 051af8d174dd0f100f407269c25c007216c912ad ] The test stats testcase was printing the same error message for multiple errors in the test stats testcase. This is now replaced with descriptive error messages, which match the cause of the failure. Fixes: 202d375c60bc ("app/test: add cryptodev unit and performance tests") Signed-off-by: Saoirse O'Donovan Acked-by: Ciara Power --- .mailmap | 1 + app/test/test_cryptodev.c | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.mailmap b/.mailmap index 3337f8a9e6..c1b73055da 100644 --- a/.mailmap +++ b/.mailmap @@ -1177,4 +1177,5 @@ Sankar Chokkalingam Santoshkumar Karanappa Rastapur Santosh Shukla +Saoirse O'Donovan Saori Usami Sarath Somasekharan diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c index a18b15d7c2..f3509bcb22 100644 --- a/app/test/test_cryptodev.c +++ b/app/test/test_cryptodev.c @@ -11100,9 +11100,9 @@ test_stats(void) "rte_cryptodev_stats_get returned unexpected enqueued stat"); TEST_ASSERT((stats.dequeued_count == 1), - "rte_cryptodev_stats_get returned unexpected enqueued stat"); + "rte_cryptodev_stats_get returned unexpected dequeued stat"); TEST_ASSERT((stats.enqueue_err_count == 0), - "rte_cryptodev_stats_get returned unexpected enqueued stat"); + "rte_cryptodev_stats_get returned unexpected enqueued error count stat"); TEST_ASSERT((stats.dequeue_err_count == 0), - "rte_cryptodev_stats_get returned unexpected enqueued stat"); + "rte_cryptodev_stats_get returned unexpected dequeued error count stat"); /* invalid device but should ignore and not reset device stats*/ @@ -11112,5 +11112,5 @@ test_stats(void) "rte_cryptodev_stats_get failed"); TEST_ASSERT((stats.enqueued_count == 1), - "rte_cryptodev_stats_get returned unexpected enqueued stat"); + "rte_cryptodev_stats_get returned unexpected enqueued stat after invalid reset"); /* check that a valid reset clears stats */ @@ -11120,7 +11120,7 @@ test_stats(void) "rte_cryptodev_stats_get failed"); TEST_ASSERT((stats.enqueued_count == 0), - "rte_cryptodev_stats_get returned unexpected enqueued stat"); + "rte_cryptodev_stats_get returned unexpected enqueued stat after valid reset"); TEST_ASSERT((stats.dequeued_count == 0), - "rte_cryptodev_stats_get returned unexpected enqueued stat"); + "rte_cryptodev_stats_get returned unexpected dequeued stat after valid reset"); return TEST_SUCCESS; -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-03-30 09:30:45.412423258 +0100 +++ 0006-test-crypto-fix-statistics-error-messages.patch 2023-03-30 09:30:45.274229272 +0100 @@ -1 +1 @@ -From 051af8d174dd0f100f407269c25c007216c912ad Mon Sep 17 00:00:00 2001 +From 57915a44ed68f9fb9141a37de495148dbb7ced44 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 051af8d174dd0f100f407269c25c007216c912ad ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index dc30369117..cac02a6f48 100644 +index 3337f8a9e6..c1b73055da 100644 @@ -24 +25 @@ -@@ -1183,4 +1183,5 @@ Sankar Chokkalingam +@@ -1177,4 +1177,5 @@ Sankar Chokkalingam @@ -31 +32 @@ -index f4648755e5..9c670e9a35 100644 +index a18b15d7c2..f3509bcb22 100644 @@ -34 +35 @@ -@@ -12342,9 +12342,9 @@ test_stats(void) +@@ -11100,9 +11100,9 @@ test_stats(void) @@ -47 +48 @@ -@@ -12354,5 +12354,5 @@ test_stats(void) +@@ -11112,5 +11112,5 @@ test_stats(void) @@ -54 +55 @@ -@@ -12362,7 +12362,7 @@ test_stats(void) +@@ -11120,7 +11120,7 @@ test_stats(void)