From 6a9145ca4b373f4d7b83f2df67535226c8ce62bd Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Wed, 19 Jan 2022 18:10:00 +0000 Subject: [PATCH] build: make flow classification optional MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Acked-by: David Marchand --- 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.39.5