From e27e13cb34d48d7a3267485d95526212d65f37bf Mon Sep 17 00:00:00 2001 From: Matthew G McGovern Date: Wed, 22 Jan 2025 12:08:36 -0800 Subject: [PATCH] Meson: fix dumb bug from merge (compile sample apps) --- microsoft/testsuites/dpdk/dpdktestpmd.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/microsoft/testsuites/dpdk/dpdktestpmd.py b/microsoft/testsuites/dpdk/dpdktestpmd.py index d615167e57..b5520b61d8 100644 --- a/microsoft/testsuites/dpdk/dpdktestpmd.py +++ b/microsoft/testsuites/dpdk/dpdktestpmd.py @@ -333,6 +333,7 @@ def get_installed_version(self) -> VersionInfo: ) def _get_meson_parameters(self) -> str: + enable_examples = "" # enable any apps we need (namely, testpmd) enable_apps = "-Denable_apps=" + ",".join(self._enable_apps) # add net/mana to the pmd list if we need it @@ -341,14 +342,15 @@ def _get_meson_parameters(self) -> str: # build the driver enable arg enable_drivers = "-Denable_drivers=" + ",".join(self._enable_drivers) # add any needed -Dc_flags or -Dc_link_args arguments + if self._sample_applications: + enable_examples = f"-Dexamples={','.join(self._sample_applications)}" + c_args = self._get_c_arguments() - return " ".join([c_args, enable_apps, enable_drivers]) + + return " ".join([c_args, enable_apps, enable_drivers, enable_examples]) def _install(self) -> None: super()._install() - if self._sample_applications: - self._meson_arguments = f"-Dexamples={','.join(self._sample_applications)}" - node = self._node # save the pythonpath for later python_path = node.tools[Python].get_python_path()