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 EB92643CAD for ; Thu, 14 Mar 2024 01:13:11 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E3FB842E40; Thu, 14 Mar 2024 01:13:11 +0100 (CET) Received: from mail-ua1-f48.google.com (mail-ua1-f48.google.com [209.85.222.48]) by mails.dpdk.org (Postfix) with ESMTP id 972AE40297 for ; Thu, 14 Mar 2024 01:13:09 +0100 (CET) Received: by mail-ua1-f48.google.com with SMTP id a1e0cc1a2514c-7d5bfdd2366so182646241.3 for ; Wed, 13 Mar 2024 17:13:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710375189; x=1710979989; 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=5tzfOgPKYpruXyor+2Sgc4FHPunsAdR7+NdutY5IjNg=; b=f0mAEM40kyHWnEp93QSSp/KVf7ocxJi1hIacluj8r3+Mys2HrXA2mDCABHPCDXElvL GwXI3cZ8B6lSq6m0mXYYLIKab9MZJgpsi8fVzgtvLe/Z/c+edF7gkqXy/YgNd5slkOB/ NvoJaO16qtX5mB0esnyQve2TEHQAPgS1ORGlkY7l65P8OTe63VZrFCPjC7HxqvPNi3/q JWPTMfELTaAUtLbgCCj7Cb/0T+sw89BR9ktOWZS58Wzi2VilblXbk69lcXlIYbM5yx8s iJ608Q5TevcMrLi0lY2mlMn5it7fqbsoUBbLNQK6AjfcNX2phpPA08PspMGzxKyUvhyr O35w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710375189; x=1710979989; 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=5tzfOgPKYpruXyor+2Sgc4FHPunsAdR7+NdutY5IjNg=; b=UIEZc29P7Wt0c0zQ+bibUFjGkmD1drBQUQNnrxE8Qe7rumCWoc0+dfynVOEmImg009 u1I1HFjyqSvFiWFlE157SxM8dO1Eq/V5vwuJk3OstSue0+R7XSAwRbCbGRPI66oyWsLz Z+DNHUzkzPJEvY/l28utqsy2H1MivQoctNkD8Ejp66pBj5LON8IUYaqsSZs6ayAWbjoX 2LUq+06fmloqwtZ1fgJlX8JFIEZ3LTrQeMwj+V4cJ03B7cpb4+vNHpnx+HPL+8brIMYt 6lw4gAJQCPx6v9+iNVKfBJmd7xvCV1+WdKPrSiDMIPPfxIqAQJlwEf72iA9VL0Ykl5yJ hk3A== X-Forwarded-Encrypted: i=1; AJvYcCXyQJkAfNe9PyHoLIdDxCG/JYmV50dzNGSnPKOJdCWtRQP6xrVENe6PnzpRwcJE4fcS2pcIXHCzsbcTifeopfc= X-Gm-Message-State: AOJu0Yy4WTRMbE+a5AxnuHYgmFeGRgBYJJVqwx+DoMwBjFk+3Gnt3oXS ADEXV25S7Km2TSoBtQRuNellOGwcb/Pe094Z3CHO25V45x98M4ws X-Google-Smtp-Source: AGHT+IFWm+eP5m6wvd/NGCU6wxbZtVsPTKGKLc5ypg/KN7zUEU68aNwv8fYGhlRwuLDO+oP3dfnnDQ== X-Received: by 2002:a05:6102:2412:b0:473:e98:d733 with SMTP id j18-20020a056102241200b004730e98d733mr547905vsi.1.1710375188883; Wed, 13 Mar 2024 17:13:08 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:7aef:1aaa:3dff:d546]) by smtp.gmail.com with ESMTPSA id r11-20020a0562140c4b00b00690494d2766sm194091qvj.96.2024.03.13.17.13.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 17:13:08 -0700 (PDT) From: luca.boccassi@gmail.com 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 22.11.5 Date: Thu, 14 Mar 2024 00:09:55 +0000 Message-Id: <20240314000957.2810803-59-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240314000957.2810803-1-luca.boccassi@gmail.com> References: <20240307013159.1735343-102-luca.boccassi@gmail.com> <20240314000957.2810803-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/16/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/bf8ce81fc0a0b05e8204b86f443e6d9c4af3a044 Thanks. Luca Boccassi --- >From bf8ce81fc0a0b05e8204b86f443e6d9c4af3a044 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 fb073ff795..5cf9f51c28 100644 --- a/app/test/test.c +++ b/app/test/test.c @@ -343,11 +343,13 @@ 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) { suite->unsupported++; -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-14 00:09:23.347365439 +0000 +++ 0059-test-do-not-count-skipped-tests-as-executed.patch 2024-03-14 00:09:20.713617206 +0000 @@ -1 +1 @@ -From a620df6df6d61660661afade09760b2dfba4eb42 Mon Sep 17 00:00:00 2001 +From bf8ce81fc0a0b05e8204b86f443e6d9c4af3a044 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 fb073ff795..5cf9f51c28 100644 @@ -34 +34 @@ -@@ -369,11 +369,13 @@ unit_test_suite_runner(struct unit_test_suite *suite) +@@ -343,11 +343,13 @@ unit_test_suite_runner(struct unit_test_suite *suite)