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 017A343829 for ; Fri, 8 Mar 2024 15:33:11 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EF0EE42F0D; Fri, 8 Mar 2024 15:33:10 +0100 (CET) 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 D9AA440E2D for ; Fri, 8 Mar 2024 15:33:08 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709908388; 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=4tp4N468fgMXlhcKsyzc31xc46m67sgN6y1zTrIr8Sk=; b=Day0/+IzhDt872+bupSM4GtqVYvFzR991fq9hbZXf9hga17yFaTW45LT+0XcVbAWJ4t1DL hCgUadya0a3sUoXIyJR/mJrvnG5w9POt6by5CssjkmDts1hWL7c1V62yq0W7UPmuRkio8O WPD7rPXHidlxY7VGTCm95ZCnTqkM06w= 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-454-7DiADIHgOzat4IDFGzPM2Q-1; Fri, 08 Mar 2024 09:33:05 -0500 X-MC-Unique: 7DiADIHgOzat4IDFGzPM2Q-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 B3D3088F565; Fri, 8 Mar 2024 14:33:04 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id B496437FC; Fri, 8 Mar 2024 14:33:03 +0000 (UTC) From: Kevin Traynor To: Bruce Richardson Cc: Akhil Goyal , Ciara Power , Tyler Retzlaff , dpdk stable Subject: patch 'test: do not count skipped tests as executed' has been queued to stable release 21.11.7 Date: Fri, 8 Mar 2024 14:28:20 +0000 Message-ID: <20240308142824.528417-32-ktraynor@redhat.com> In-Reply-To: <20240308142824.528417-1-ktraynor@redhat.com> References: <20240308142824.528417-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 03/13/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/3304b1f97b9a9d7b80b52692653aeda7e6e8a1f6 Thanks. Kevin --- >From 3304b1f97b9a9d7b80b52692653aeda7e6e8a1f6 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Mon, 13 Nov 2023 15:05:33 +0000 Subject: [PATCH] test: do not count skipped tests as executed [ upstream commit a620df6df6d61660661afade09760b2dfba4eb42 ] The logic around skipped tests is a little confusing in the unit test runner. * Any explicitly disabled tests are counted as skipped but not executed. * Any tests that return TEST_SKIPPED are counted as both skipped and executed, using the same statistics counters. This makes the stats very strange and hard to correlate, since the totals don't add up. One would expect that SKIPPED + EXECUTED + UNSUPPORTED == TOTAL, and that PASSED + FAILED == EXECUTED. To achieve this, mark any tests returning TEST_SKIPPED, or ENOTSUP as not having executed. Signed-off-by: Bruce Richardson Acked-by: Akhil Goyal Acked-by: Ciara Power Acked-by: Tyler Retzlaff --- app/test/test.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/test/test.c b/app/test/test.c index 5194131026..f7375cfe88 100644 --- a/app/test/test.c +++ b/app/test/test.c @@ -351,9 +351,11 @@ unit_test_suite_runner(struct unit_test_suite *suite) if (test_success == TEST_SUCCESS) suite->succeeded++; - else if (test_success == TEST_SKIPPED) + else if (test_success == TEST_SKIPPED) { suite->skipped++; - else if (test_success == -ENOTSUP) + suite->executed--; + } else if (test_success == -ENOTSUP) { suite->unsupported++; - else + suite->executed--; + } else suite->failed++; } else if (test_success == -ENOTSUP) { -- 2.43.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-08 13:47:49.955897864 +0000 +++ 0032-test-do-not-count-skipped-tests-as-executed.patch 2024-03-08 13:47:49.040686729 +0000 @@ -1 +1 @@ -From a620df6df6d61660661afade09760b2dfba4eb42 Mon Sep 17 00:00:00 2001 +From 3304b1f97b9a9d7b80b52692653aeda7e6e8a1f6 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a620df6df6d61660661afade09760b2dfba4eb42 ] + @@ -20,2 +21,0 @@ -Cc: stable@dpdk.org - @@ -31 +31 @@ -index 8b25615913..680351f6a3 100644 +index 5194131026..f7375cfe88 100644 @@ -34 +34 @@ -@@ -370,9 +370,11 @@ unit_test_suite_runner(struct unit_test_suite *suite) +@@ -351,9 +351,11 @@ unit_test_suite_runner(struct unit_test_suite *suite)