Some tests make optionally use a component but don't require it for
building. If we include the dependency in the per-file lists, then tests
may be unnecessarily omitted, as the dependency is not required.
On the other hand, removing the optional dependency from the list can
cause build failures, as the test case may include the optional code,
but then fail to build as the build system won't have added the necessary
paths for header inclusion, or the necessary libraries for linking.
Resolve this by explicitly providing a list of optional dependencies.
Any items in this list will be added to the dependency list if
available, but otherwise won't be involved in enable/disable of specific
tests.
Signed-off-by: Bruce Richardson <bruce.richard...@intel.com>
---
app/test/meson.build | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/app/test/meson.build b/app/test/meson.build
index 05bae9216d..80b60f68b2 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -5,6 +5,10 @@
deps += ['cmdline', 'ring', 'mempool', 'mbuf']
sources += files('commands.c', 'test.c')
+# optional dependencies: some files may use these - and so we should link them
in -
+# but do not explicitly require them so they are not listed in the per-file
lists below
+optional_deps = []
+
# some other utility C files, providing functions used by various tests
# so we need to include these deps in the dependency list for the files using
those fns.
packet_burst_generator_deps = ['net']
@@ -226,6 +230,12 @@ foreach f, f_deps : source_file_deps
sources += files(f)
endif
endforeach
+# add the optional dependencies
+foreach d:optional_deps
+ if is_variable(def_lib + '_rte_' + d) and d not in deps
+ deps += d
+ endif
+endforeach
if cc.has_argument('-Wno-format-truncation')
cflags += '-Wno-format-truncation'
--
2.39.2
