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 39951A0032; Wed, 19 Jan 2022 19:34:20 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2C00C411CE; Wed, 19 Jan 2022 19:34:20 +0100 (CET) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mails.dpdk.org (Postfix) with ESMTP id 0F2D641147 for ; Wed, 19 Jan 2022 19:34:17 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1642617258; x=1674153258; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=CoTvZtROoeilLRfZq/nYtF/XRouXT6+ZHxXcQWBQhJs=; b=TfKzh2cVsOuUFjJ2FKiZPOigInB5nzCtuFbdWaU4/Xd/yb0DshrudW9T Z1UZ6152JZ5uc6h7jRsSj3KuY/rwqMTIbrQ88QiW5C4X+ILAqJ/NfISwf /oAKhFnzW8qp2wOXPSDE1ftRH2cY4KLUDO9KucAq1zPeSj5SLaYQT5vcH vPEgeyrkgxn32yeKiusztA5zGa4FgbMWl8ulMY1B+BgFJdngKoHJb+9jG Q7K1kz+Jltw3TyAXWNXbU1hktqtO5SwHQcQaOMy5PPTgsKuJW4ubCfLuO 5p7s/xLiRgk9Iq2DMWqj9PmahOWBjCnXKT/9Jg5MIjbFkSWBqSVxDhM73 A==; X-IronPort-AV: E=McAfee;i="6200,9189,10231"; a="331496566" X-IronPort-AV: E=Sophos;i="5.88,300,1635231600"; d="scan'208";a="331496566" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Jan 2022 10:10:29 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,300,1635231600"; d="scan'208";a="578907380" Received: from silpixa00399126.ir.intel.com ([10.237.223.86]) by fmsmga008.fm.intel.com with ESMTP; 19 Jan 2022 10:10:27 -0800 From: Bruce Richardson To: dev@dpdk.org Cc: david.marchand@redhat.com, Bruce Richardson , Stephen Hemminger , =?UTF-8?q?Morten=20Br=C3=B8rup?= Subject: [PATCH v2 4/6] build: add flow classification library to optional list Date: Wed, 19 Jan 2022 18:10:00 +0000 Message-Id: <20220119181002.471195-5-bruce.richardson@intel.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220119181002.471195-1-bruce.richardson@intel.com> References: <20220113173918.2700651-1-bruce.richardson@intel.com> <20220119181002.471195-1-bruce.richardson@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Add the flow_classify library to the list of optional libraries, and ensure tests can build with it disabled. Signed-off-by: Bruce Richardson Acked-by: Stephen Hemminger Acked-by: Morten Brørup --- app/test/meson.build | 7 +++++-- lib/meson.build | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/test/meson.build b/app/test/meson.build index 210e03fbff..a39dd68934 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -65,7 +65,6 @@ test_sources = files( 'test_fib6.c', 'test_fib6_perf.c', 'test_func_reentrancy.c', - 'test_flow_classify.c', 'test_graph.c', 'test_graph_perf.c', 'test_hash.c', @@ -196,7 +195,6 @@ fast_tests = [ ['fib_autotest', true], ['fib6_autotest', true], ['func_reentrancy_autotest', false], - ['flow_classify_autotest', false], ['hash_autotest', true], ['interrupt_autotest', true], ['ipfrag_autotest', false], @@ -349,6 +347,11 @@ endif if dpdk_conf.has('RTE_EVENT_SKELETON') test_deps += 'event_skeleton' endif + +if dpdk_conf.has('RTE_LIB_FLOW_CLASSIFY') + test_sources += 'test_flow_classify.c' + fast_tests += [['flow_classify_autotest', false]] +endif if dpdk_conf.has('RTE_LIB_METRICS') test_sources += ['test_metrics.c'] fast_tests += [['metrics_autotest', true]] diff --git a/lib/meson.build b/lib/meson.build index dd20fe70a6..ede5199374 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -67,6 +67,7 @@ libraries = [ optional_libs = [ 'bitratestats', + 'flow_classify', 'gpudev', 'gro', 'gso', -- 2.32.0