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 2FE8CA0503 for ; Mon, 21 Mar 2022 14:13:55 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 24020427EE; Mon, 21 Mar 2022 14:13:55 +0100 (CET) Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by mails.dpdk.org (Postfix) with ESMTP id 827F24161A; Mon, 21 Mar 2022 14:13:52 +0100 (CET) Received: by linux.microsoft.com (Postfix, from userid 1086) id B6A3820DE45E; Mon, 21 Mar 2022 06:13:51 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com B6A3820DE45E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1647868431; bh=7x8qtQD1jliwX0215fTgEjlRTOqbDkbVpBIadzA5/nw=; h=From:To:Cc:Subject:Date:From; b=GLXd5hYbOl9Bd5vEgBlMKF5CUeZkiqJAgpnRBg7RFE++YgIV3Y6qOKQK+XByKPD5v i8fmROC7/VOKRtmkUW6OYf2zRpLs8o15sEzoTud9zMWHvMIs5ECGwGlNwonsySdEnb ij4QZcbVV+s/r2wZ0R7mQpVa3bnfImvijuZGM8E0= From: Tyler Retzlaff To: dev@dpdk.org Cc: stephen@networkplumber.org, anatoly.burakov@intel.com, Tyler Retzlaff , stable@dpdk.org Subject: [PATCH] test/bpf: skip test if libpcap is unavailable Date: Mon, 21 Mar 2022 06:13:27 -0700 Message-Id: <1647868407-4467-1-git-send-email-roretzla@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 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 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") Cc: stephen@networkplumber.org Cc: anatoly.burakov@intel.com Cc: stable@dpdk.org Signed-off-by: Tyler Retzlaff --- 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 805cce6..de1fa87 100644 --- a/app/test/test_bpf.c +++ b/app/test/test_bpf.c @@ -3264,7 +3264,16 @@ struct bpf_test { REGISTER_TEST_COMMAND(bpf_autotest, test_bpf); -#ifdef RTE_HAS_LIBPCAP +#ifndef RTE_HAS_LIBPCAP + +static int +test_bpf_convert(void) +{ + printf("BPF not supported, skipping test\n"); + return TEST_SKIPPED; +} + +#else #include static void @@ -3462,5 +3471,6 @@ struct bpf_test { return rc; } -REGISTER_TEST_COMMAND(bpf_convert_autotest, test_bpf_convert); #endif /* RTE_HAS_LIBPCAP */ + +REGISTER_TEST_COMMAND(bpf_convert_autotest, test_bpf_convert); -- 1.8.3.1