[dts] [PATCH V1 0/6] support meson build

[dts] [PATCH V1 0/6] support meson build

[lingwei]

support meson build

lingwei (6):
  tests/TestSuite_metrics:support meson build
  tests/TestSuite_af_xdp_2:support meson build
  tests/TestSuite_macsec_for_ixgbe.py:support meson build
  tests/TestSuite_packet_ordering:support meson build
  tests/TestSuite_qos_meter.py:support meson build
  tests/TestSuite_vmdq_dcb:support meson build

 tests/TestSuite_af_xdp_2.py         |  6 +++---
 tests/TestSuite_macsec_for_ixgbe.py |  9 ++++++---
 tests/TestSuite_metrics.py          | 12 ++----------
 tests/TestSuite_packet_ordering.py  |  6 ++++--
 tests/TestSuite_qos_meter.py        |  3 ++-
 tests/TestSuite_vmdq_dcb.py         |  8 +++++---
 6 files changed, 22 insertions(+), 22 deletions(-)

-- 
2.17.1

[dts] [dts 1/6] tests/TestSuite_metrics:support meson build

[lingwei]

Signed-off-by: lingwei <weix.ling@intel.com>
---
 tests/TestSuite_metrics.py | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/tests/TestSuite_metrics.py b/tests/TestSuite_metrics.py
index 7fef17d..d1b7fe9 100644
--- a/tests/TestSuite_metrics.py
+++ b/tests/TestSuite_metrics.py
@@ -75,14 +75,6 @@ class TestMetrics(TestCase):
         output2 = self.dut.alt_session.session.get_session_before(2)
         return output + os.linesep + output2
 
-    @property
-    def target_dir(self):
-        # get absolute directory of target source code
-        target_dir = '/root' + self.dut.base_dir[1:] \
-                     if self.dut.base_dir.startswith('~') else \
-                     self.dut.base_dir
-        return target_dir
-
     def get_pkt_len(self, pkt_type, frame_size=64):
         headers_size = sum(
             [HEADER_SIZE[x] for x in ['eth', 'ip', pkt_type]])
@@ -188,8 +180,8 @@ class TestMetrics(TestCase):
 
     def init_proc_info_tool(self):
         option = f' -v --file-prefix={self.prefix} -- --metrics'
-        self.dpdk_proc = os.path.join(
-            self.target_dir, self.target, "app", "dpdk-procinfo" + option)
+        app_name = self.dut.apps_name['proc-info']
+        self.dpdk_proc = os.path.join(app_name + option)
         self.metrics_stat = []
 
     def proc_info_query(self, flag=None):
-- 
2.17.1

[dts] [dts 2/6] tests/TestSuite_af_xdp_2:support meson build

[lingwei]

Signed-off-by: lingwei <weix.ling@intel.com>
---
 tests/TestSuite_af_xdp_2.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/TestSuite_af_xdp_2.py b/tests/TestSuite_af_xdp_2.py
index 4397597..f1d495f 100644
--- a/tests/TestSuite_af_xdp_2.py
+++ b/tests/TestSuite_af_xdp_2.py
@@ -188,9 +188,9 @@ class TestAfXdp(TestCase):
 
         eal_params = self.dut.create_eal_parameters(cores=self.core_list[:-max(self.port_num, self.vdev_num) * self.queue_number],
                 vdevs=vdev, no_pci=True)
-        command_line = "./%s/app/testpmd %s --log-level=pmd.net.af_xdp:8 -- -i %s %s --auto-start --nb-cores=%d --rxq=%d --txq=%d %s"
-        command = command_line % (self.dut.target, eal_params, fwd_mode, rss_ip,
-                self.nb_cores, self.queue_number, self.queue_number, topology)
+        app_name = self.dut.apps_name['test-pmd']
+        command = app_name + " %s --log-level=pmd.net.af_xdp:8 -- -i %s %s --auto-start --nb-cores=%d --rxq=%d " \
+                             "--txq=%d %s" % (eal_params, fwd_mode, rss_ip, self.nb_cores, self.queue_number, self.queue_number, topology)
 
         self.logger.info('start testpmd')
         self.dut.send_expect(command, "testpmd> ", 120)
-- 
2.17.1

[dts] [dts 3/6] tests/TestSuite_macsec_for_ixgbe.py:support meson build

[lingwei]

Signed-off-by: lingwei <weix.ling@intel.com>
---
 tests/TestSuite_macsec_for_ixgbe.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tests/TestSuite_macsec_for_ixgbe.py b/tests/TestSuite_macsec_for_ixgbe.py
index a50173a..4b010d0 100644
--- a/tests/TestSuite_macsec_for_ixgbe.py
+++ b/tests/TestSuite_macsec_for_ixgbe.py
@@ -70,17 +70,20 @@ class TestMacsecForIxgbe(TestCase):
 
     def start_testpmd_rx(self):
         eal_params = self.dut.create_eal_parameters(cores=self.core_list[0:2], ports=[self.pci_rx], prefix='rx')
-        cmd_rx = self.target + '/app/testpmd ' + eal_params + '-- -i --port-topology=chained'
+        app_name = self.dut.apps_name['test-pmd']
+        cmd_rx =  app_name + eal_params + '-- -i --port-topology=chained'
         return self.dut.send_expect(cmd_rx, "testpmd", 120)
 
     def start_testpmd_tx(self):
         eal_params = self.dut.create_eal_parameters(cores=self.core_list[2:4], ports=[self.pci_tx], prefix='tx')
-        cmd_tx = self.target + '/app/testpmd ' + eal_params + '-- -i --port-topology=chained'
+        app_name = self.dut.apps_name['test-pmd']
+        cmd_tx = app_name +  eal_params + '-- -i --port-topology=chained'
         return self.session_sec.send_expect(cmd_tx, "testpmd", 120)
     
     def start_testpmd_perf(self):
         eal_params = self.dut.create_eal_parameters(cores=self.core_list[0:2])
-        cmd = self.target + '/app/testpmd ' + eal_params + '-- -i --port-topology=chained'
+        app_name = self.dut.apps_name['test-pmd']
+        cmd = app_name + eal_params + '-- -i --port-topology=chained'
         self.dut.send_expect(cmd, "testpmd", 120)
         self.rx_set_macsec_offload('on', 'on')
         self.dut.send_expect("set fwd mac", "testpmd>", 2)
-- 
2.17.1

[dts] [dts 4/6] tests/TestSuite_packet_ordering:support meson build

[lingwei]

Signed-off-by: lingwei <weix.ling@intel.com>
---
 tests/TestSuite_packet_ordering.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/TestSuite_packet_ordering.py b/tests/TestSuite_packet_ordering.py
index ac6b930..067e886 100644
--- a/tests/TestSuite_packet_ordering.py
+++ b/tests/TestSuite_packet_ordering.py
@@ -66,7 +66,8 @@ class TestPacketOrdering(TestCase):
         self.port_mask = utils.create_mask(valports)
 
         # Builds the packet ordering example app and checks for errors.
-        out = self.dut.send_expect("make -C examples/packet_ordering", "#")
+        # out = self.dut.send_expect("make -C examples/packet_ordering", "#")
+        out = self.dut.build_dpdk_apps("./examples/packet_ordering")
         self.verify("Error" not in out and "No such file" not in out,
                     "Compilation error")
 
@@ -78,7 +79,8 @@ class TestPacketOrdering(TestCase):
 
     def start_application(self):
 
-        cmdline = './examples/packet_ordering/build/packet_ordering -c {0} -n {1} -- -p {2}' . \
+        app_name = self.dut.apps_name['packet_ordering']
+        cmdline = app_name + '-c {0} -n {1} -- -p {2}'.\
             format(self.core_mask, self.dut.get_memory_channels(), self.port_mask)
         # Executes the packet ordering example app.
         self.dut.send_expect(cmdline, 'REORDERAPP', 120)
-- 
2.17.1

[dts] [dts 5/6] tests/TestSuite_qos_meter.py:support meson build

[lingwei]

Signed-off-by: lingwei <weix.ling@intel.com>
---
 tests/TestSuite_qos_meter.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/TestSuite_qos_meter.py b/tests/TestSuite_qos_meter.py
index af15e0a..fa19312 100644
--- a/tests/TestSuite_qos_meter.py
+++ b/tests/TestSuite_qos_meter.py
@@ -78,7 +78,8 @@ class TestQosMeter(TestCase):
         self.verify("Error" not in out, "Compilation error")
         self.verify("No such" not in out, "Compilation error")
         eal_params = self.dut.create_eal_parameters(cores='1S/1C/1T', fixed_prefix=True, prefix='qos_meter')
-        cmd = './examples/qos_meter/build/qos_meter ' + eal_params + '-- -p 0x3'
+        app_name = self.dut.apps_name['qos_meter']
+        cmd = app_name + eal_params + '-- -p 0x3'
         self.dut.send_expect(cmd, "TX = 1")
         payload_size = 64 - HEADER_SIZE['eth'] - HEADER_SIZE['ip']
         dts_mac = self.dut.get_mac_address(self.dut_ports[self.rx_port])
-- 
2.17.1

[dts] [dts 6/6] tests/TestSuite_vmdq_dcb:support meson build

[lingwei]

Signed-off-by: lingwei <weix.ling@intel.com>
---
 tests/TestSuite_vmdq_dcb.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/tests/TestSuite_vmdq_dcb.py b/tests/TestSuite_vmdq_dcb.py
index 6c71365..70d3dc4 100644
--- a/tests/TestSuite_vmdq_dcb.py
+++ b/tests/TestSuite_vmdq_dcb.py
@@ -86,7 +86,7 @@ class TestVmdqDcb(TestCase):
         """
         Build example "Vmdq_dcb".
         """
-        out = self.dut.send_expect("make -C examples/vmdq_dcb", "#", 10)
+        out = self.dut.build_dpdk_apps("examples/vmdq_dcb")
         self.verify("Error" not in out, "Compilation error")
 
     def rebuild_dpdk(self, nb_queue_per_vm=4):
@@ -114,8 +114,10 @@ class TestVmdqDcb(TestCase):
         for i in self.dut_ports:
             eal_param += " -w %s" % self.dut.ports_info[i]['pci']
         # Run the application
-        self.dut.send_expect("./examples/vmdq_dcb/build/vmdq_dcb_app -c %s -n 4 %s -- -p %s --nb-pools %s --nb-tcs %s "
-                             "--enable-rss" % (core_mask, eal_param, port_mask, str(npools), str(ntcs)), "reading queues", 120)
+        app_name = self.dut.apps_name['vmdq_dcb']
+        command = app_name + "-c %s -n 4 %s -- -p %s --nb-pools %s --nb-tcs %s " \
+                             "--enable-rss" % (core_mask, eal_param, port_mask, str(npools), str(ntcs))
+        self.dut.send_expect(command, "reading queues", 120)
 
     def create_pcaps(self, prios):
         """
-- 
2.17.1

Re: [dts] [PATCH V1 0/6] support meson build

[Tu, Lijuan]

> Subject: [dts] [PATCH V1 0/6] support meson build
> 
> support meson build
> 
> lingwei (6):
>   tests/TestSuite_metrics:support meson build
>   tests/TestSuite_af_xdp_2:support meson build
>   tests/TestSuite_macsec_for_ixgbe.py:support meson build
>   tests/TestSuite_packet_ordering:support meson build
>   tests/TestSuite_qos_meter.py:support meson build
>   tests/TestSuite_vmdq_dcb:support meson build
> 
>  tests/TestSuite_af_xdp_2.py         |  6 +++---
>  tests/TestSuite_macsec_for_ixgbe.py |  9 ++++++---
>  tests/TestSuite_metrics.py          | 12 ++----------
>  tests/TestSuite_packet_ordering.py  |  6 ++++--
>  tests/TestSuite_qos_meter.py        |  3 ++-
>  tests/TestSuite_vmdq_dcb.py         |  8 +++++---
>  6 files changed, 22 insertions(+), 22 deletions(-)

Applied the series