Allow disabling of the graph library in builds. Signed-off-by: David Marchand <david.march...@redhat.com> --- app/test/meson.build | 12 +++++++----- lib/meson.build | 1 + 2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/app/test/meson.build b/app/test/meson.build index 35d6baeb22..c96488126f 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -61,8 +61,6 @@ test_sources = files( 'test_fib6.c', 'test_fib6_perf.c', 'test_func_reentrancy.c', - 'test_graph.c', - 'test_graph_perf.c', 'test_hash.c', 'test_hash_functions.c', 'test_hash_multiwriter.c', @@ -250,8 +248,6 @@ fast_tests = [ ['thash_autotest', true, true], ['threads_autotest', true, true], ['trace_autotest', true, true], - ['graph_autotest', true, true], - ['node_list_dump', true, true], ] # Tests known to have issues or which don't belong in other tests lists. @@ -300,7 +296,6 @@ perf_test_names = [ 'trace_perf_autotest', 'ipsec_perf_autotest', 'thash_perf_autotest', - 'graph_perf_autotest', ] driver_test_names = [ @@ -366,6 +361,13 @@ if dpdk_conf.has('RTE_LIB_FLOW_CLASSIFY') test_sources += 'test_flow_classify.c' fast_tests += [['flow_classify_autotest', false, true]] endif +if dpdk_conf.has('RTE_LIB_GRAPH') + test_sources += 'test_graph.c' + fast_tests += [['graph_autotest', true, true]] + fast_tests += [['node_list_dump', true, true]] + test_sources += 'test_graph_perf.c' + perf_test_names += 'graph_perf_autotest' +endif if dpdk_conf.has('RTE_LIB_METRICS') test_sources += ['test_metrics.c'] fast_tests += [['metrics_autotest', true, true]] diff --git a/lib/meson.build b/lib/meson.build index 9677239236..7310021833 100644 --- a/lib/meson.build +++ b/lib/meson.build @@ -72,6 +72,7 @@ optional_libs = [ 'cfgfile', 'flow_classify', 'gpudev', + 'graph', 'gro', 'gso', 'kni', -- 2.40.1