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 B1498A0093 for ; Tue, 10 May 2022 14:30:30 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9F67C42831; Tue, 10 May 2022 14:30:30 +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 46E5D4282F for ; Tue, 10 May 2022 14:30:29 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1652185828; 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=LoKQqdSAuIcTNDqvt+kKN/SQ80TrWfZA0X57dGRbvh0=; b=UtTVFNbGWwQdZIoKy3mF2kHTaM3V2GiVgod9P227yfdOyvvtzER2A8E5QXovvBd4UUGUCI RCLp2ZFzK1QO7g+cwImS7W4b25EKcBHi7OXgf8bke575CTUEGQRUnB6UudKXlXjX5KQVpX IPm50fx/hDgxQuy10SuRpUWOSlhUVe8= 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-380-qKoGCL6JMWabFbG72NAFmw-1; Tue, 10 May 2022 08:30:24 -0400 X-MC-Unique: qKoGCL6JMWabFbG72NAFmw-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 83FB3185A794; Tue, 10 May 2022 12:30:24 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.199]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3FA08400E89C; Tue, 10 May 2022 12:30:23 +0000 (UTC) From: Kevin Traynor To: Tyler Retzlaff Cc: Stephen Hemminger , Konstantin Ananyev , dpdk stable Subject: patch 'test/bpf: skip test if libpcap is unavailable' has been queued to stable release 21.11.2 Date: Tue, 10 May 2022 13:29:41 +0100 Message-Id: <20220510123010.159523-4-ktraynor@redhat.com> In-Reply-To: <20220510123010.159523-1-ktraynor@redhat.com> References: <20220510123010.159523-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.11.54.1 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com 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.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/15/22. 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/a25197930d58fc754bd9c91d55db31d521ddcb5f Thanks. Kevin --- >From a25197930d58fc754bd9c91d55db31d521ddcb5f Mon Sep 17 00:00:00 2001 From: Tyler Retzlaff Date: Tue, 22 Mar 2022 00:12:35 -0700 Subject: [PATCH] test/bpf: skip test if libpcap is unavailable [ upstream commit 55ae8965bf8eecd5ebec36663bb0f36018abf64b ] test_bpf_convert is being conditionally registered depending on the presence of RTE_HAS_LIBPCAP except the UT unconditionally lists it as a test to run. When the UT runs test_bpf_convert test-dpdk can't find the registration and assumes the DPDK_TEST environment variable hasn't been defined resulting in test-dpdk dropping to interactive mode and subsequently waiting for the remainder of the UT fast-test timeout period before reporting the test as having timed out. * unconditionally register test_bpf_convert, * if ! RTE_HAS_LIBPCAP provide a stub test_bpf_convert that reports the test is skipped similar to that done with the test_bpf test. Fixes: 2eccf6afbea9 ("bpf: add function to convert classic BPF to DPDK BPF") Signed-off-by: Tyler Retzlaff Acked-by: Stephen Hemminger Acked-by: Konstantin Ananyev --- app/test/test_bpf.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/app/test/test_bpf.c b/app/test/test_bpf.c index c422fedf1f..d70bb0fe85 100644 --- a/app/test/test_bpf.c +++ b/app/test/test_bpf.c @@ -3251,5 +3251,14 @@ test_bpf(void) REGISTER_TEST_COMMAND(bpf_autotest, test_bpf); -#ifdef RTE_HAS_LIBPCAP +#ifndef RTE_HAS_LIBPCAP + +static int +test_bpf_convert(void) +{ + printf("BPF convert RTE_HAS_LIBPCAP is undefined, skipping test\n"); + return TEST_SKIPPED; +} + +#else #include @@ -3449,4 +3458,5 @@ test_bpf_convert(void) } -REGISTER_TEST_COMMAND(bpf_convert_autotest, test_bpf_convert); #endif /* RTE_HAS_LIBPCAP */ + +REGISTER_TEST_COMMAND(bpf_convert_autotest, test_bpf_convert); -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-05-10 13:24:21.709057716 +0100 +++ 0004-test-bpf-skip-test-if-libpcap-is-unavailable.patch 2022-05-10 13:24:21.551646292 +0100 @@ -1 +1 @@ -From 55ae8965bf8eecd5ebec36663bb0f36018abf64b Mon Sep 17 00:00:00 2001 +From a25197930d58fc754bd9c91d55db31d521ddcb5f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 55ae8965bf8eecd5ebec36663bb0f36018abf64b ] + @@ -21 +22,0 @@ -Cc: stable@dpdk.org @@ -31 +32 @@ -index 805cce6406..97f500809e 100644 +index c422fedf1f..d70bb0fe85 100644 @@ -34 +35 @@ -@@ -3265,5 +3265,14 @@ test_bpf(void) +@@ -3251,5 +3251,14 @@ test_bpf(void) @@ -50 +51 @@ -@@ -3463,4 +3472,5 @@ test_bpf_convert(void) +@@ -3449,4 +3458,5 @@ test_bpf_convert(void)