[25/38] tests/TestSuite_userspace_ethtool.py: adapt to support both meson and makefile build

Message ID 20200908071825.118583-26-junx.w.zhou@intel.com (mailing list archive)
State Accepted
Headers
Series Modify suites to support meson |

Commit Message

Zhou, JunX W Sept. 8, 2020, 7:18 a.m. UTC
  From: Zhou jun <junx.w.zhou@intel.com>

Signed-off-by: Zhou jun <junx.w.zhou@intel.com>
---
 tests/TestSuite_userspace_ethtool.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
  

Patch

diff --git a/tests/TestSuite_userspace_ethtool.py b/tests/TestSuite_userspace_ethtool.py
index 2b8fa17..213a628 100644
--- a/tests/TestSuite_userspace_ethtool.py
+++ b/tests/TestSuite_userspace_ethtool.py
@@ -62,14 +62,14 @@  class TestUserspaceEthtool(TestCase, IxiaPacketGenerator):
         self.verify("Error" not in out, "compilation error 1")
         self.verify("No such file" not in out, "compilation error 2")
 
-        path = "./examples/ethtool/ethtool-app/%s/ethtool" % self.target
+        self.app_ethtool_path = self.dut.apps_name['ethtool']
         used_dut_port_pci = self.dut.ports_info[self.ports[0]]['port'].pci
         out = self.dut.send_expect("cat /sys/bus/pci/devices/%s/numa_node " % used_dut_port_pci, "# ")
         cpu_cores = self.dut.send_expect('lscpu |grep "NUMA node%s CPU(s):"' % out, "# ")
         core = re.findall(r"\d+-(\d+)", cpu_cores)[0]
         core = int(core)
         cores = "%d,%d,%d,%d" % (core - 1, core - 2, core - 3, core - 4)
-        self.cmd = "%s -l %s -n %d" % (path, cores, self.dut.get_memory_channels())
+        self.cmd = "%s -l %s -n %d" % (self.app_ethtool_path, cores, self.dut.get_memory_channels())
 
         # pause frame basic configuration
         self.pause_time = 65535