dpdk: set env args for testpmd asan

Author: mcgov

microsoft/testsuites/dpdk/dpdktestpmd.py

@@ -3,7 +3,7 @@
 
 import re
 from pathlib import PurePath, PurePosixPath
-from typing import Any, List, Tuple, Type
+from typing import Any, Dict, List, Optional, Tuple, Type
 
 from assertpy import assert_that, fail
 from semver import VersionInfo
@@ -615,9 +615,16 @@ def generate_testpmd_command(
     def run_for_n_seconds(self, cmd: str, timeout: int) -> str:
         self._last_run_timeout = timeout
         self.node.log.info(f"{self.node.name} running: {cmd}")
-
+        envs: Optional[Dict[str, str]] = (
+            {
+                "ASAN_OPTIONS": "detect_leaks=false",
+                "LD_PRELOAD": find_libasan_so(self.node),
+            }
+            if self.installer.use_asan
+            else None
+        )
         proc_result = self.node.tools[Timeout].run_with_timeout(
-            cmd, timeout, SIGINT, kill_timeout=timeout + 10
+            cmd, timeout, SIGINT, kill_timeout=timeout + 10, update_envs=envs
         )
         self._last_run_output = proc_result.stdout
         self.populate_performance_data()
@@ -626,7 +633,6 @@ def run_for_n_seconds(self, cmd: str, timeout: int) -> str:
     def start_for_n_seconds(self, cmd: str, timeout: int) -> str:
         self._last_run_timeout = timeout
         self.node.log.info(f"{self.node.name} running: {cmd}")
-
         proc_result = self.node.tools[Timeout].run_with_timeout(
             cmd, timeout, SIGINT, kill_timeout=timeout + 10
         )
@@ -746,11 +752,9 @@ def get_example_app_path(self, app_name: str) -> PurePath:
         if not shell.exists(source_path.joinpath("build")):
             libasan_so = find_libasan_so(self.node)
             assert libasan_so != "", "couldn't find libasan"
-            envs = (
+            envs: Optional[Dict[str, str]] = (
                 {
                     "CFLAGS": "-fsanitize=address",
-                    "ASAN_OPTIONS": "detect_leaks=false",
-                    "LD_PRELOAD": libasan_so,
                 }
                 if self.installer.use_asan
                 else None

microsoft/testsuites/dpdk/dpdkutil.py

@@ -496,6 +496,7 @@ def _run_command_with_testkit(
         run_kit: Tuple[DpdkTestResources, str],
     ) -> Tuple[DpdkTestResources, str]:
         testkit, cmd = run_kit
+
         return (testkit, testkit.testpmd.run_for_n_seconds(cmd, seconds))
 
     task_manager = run_in_parallel_async(
@@ -1348,7 +1349,7 @@ class DpdkDevnameInfo:
     def __init__(self, testpmd: DpdkTestpmd) -> None:
         self._node = testpmd.node
         self._testpmd = testpmd
-        self.env_args = None
+        self.env_args: Optional[Dict[str, str]] = None
 
     def get_port_info(self, nics: List[NicInfo], expect_ports: int = 1) -> str:
         # since we only need this for netvsc, we'll only generate