test suite reviews and discussions
 help / color / Atom feed
From: "Zhou, Jun" <junx.w.zhou@intel.com>
To: dts@dpdk.org
Cc: Zhou jun <junx.w.zhou@intel.com>
Subject: [dts] [dts 36/38] tests/TestSuite_vm2vm_virtio_user.py: adapt to support both meson and makefile build
Date: Tue,  8 Sep 2020 07:18:23 +0000
Message-ID: <20200908071825.118583-37-junx.w.zhou@intel.com> (raw)
In-Reply-To: <20200908071825.118583-1-junx.w.zhou@intel.com>

From: Zhou jun <junx.w.zhou@intel.com>

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

diff --git a/tests/TestSuite_vm2vm_virtio_user.py b/tests/TestSuite_vm2vm_virtio_user.py
index e743e61..16b90c0 100644
--- a/tests/TestSuite_vm2vm_virtio_user.py
+++ b/tests/TestSuite_vm2vm_virtio_user.py
@@ -59,6 +59,8 @@ class TestVM2VMVirtioUser(TestCase):
         self.rebuild_flag = False
         self.config_value = 'CONFIG_RTE_LIBRTE_PMD_PCAP'
         self.enable_pcap_lib_in_dpdk(self.dut)
+        self.app_testpmd_path = self.dut.apps_name['test-pmd']
+        self.app_pdump = self.dut.apps_name['pdump']
 
     def set_up(self):
         """
@@ -98,6 +100,7 @@ class TestVM2VMVirtioUser(TestCase):
         if str.lower(default_value) != 'y':
             client_dut.send_expect("sed -i 's/%s=n$/%s=y/' config/common_base" % (
                     self.config_value, self.config_value), '# ')
+            client_dut.set_build_options({'RTE_LIBRTE_PMD_PCAP': 'y'})
             client_dut.build_install_dpdk(self.target)
             self.rebuild_flag = True
 
@@ -108,6 +111,7 @@ class TestVM2VMVirtioUser(TestCase):
         if self.rebuild_flag is True:
             client_dut.send_expect("sed -i 's/%s=y$/%s=n/' config/common_base" %
                         (self.config_value, self.config_value), "#")
+            client_dut.set_build_options({'RTE_LIBRTE_PMD_PCAP': 'n'})
             client_dut.build_install_dpdk(self.target)
 
     def launch_vhost_testpmd(self, vdev_num, fixed_prefix=False, fwd_mode='io'):
@@ -117,7 +121,7 @@ class TestVM2VMVirtioUser(TestCase):
         for i in range(vdev_num):
             vdev_params += "--vdev 'net_vhost%d,iface=./vhost-net%d,queues=1' " % (i, i)
 
-        self.command_line = self.dut.target + '/app/testpmd %s ' + \
+        self.command_line = self.app_testpmd_path + ' %s ' + \
             '--socket-mem %s %s -- -i --nb-cores=1 --no-flush-rx'
 
         self.command_line = self.command_line % (
@@ -139,7 +143,7 @@ class TestVM2VMVirtioUser(TestCase):
         if self.check_2M_env:
             eal_params += " --single-file-segments "
         vdev_params = '--vdev=net_virtio_user1,mac=00:01:02:03:04:05,path=./vhost-net1,queues=1,%s,queue_size=%d ' % (path_mode, ringsize)
-        command_line = self.dut.target + "/app/testpmd %s " + \
+        command_line = self.app_testpmd_path + " %s " + \
             "--socket-mem %s %s -- -i --nb-cores=1 --txd=%d --rxd=%d %s"
         command_line = command_line % (eal_params, self.socket_mem,
                                     vdev_params, ringsize, ringsize, extern_params)
@@ -157,7 +161,7 @@ class TestVM2VMVirtioUser(TestCase):
         if self.check_2M_env:
             eal_params += " --single-file-segments "
         vdev_params = '--vdev=net_virtio_user0,mac=00:01:02:03:04:05,path=./vhost-net0,queues=1,%s,queue_size=%d ' % (path_mode, ringsize)
-        command_line = self.dut.target + '/app/testpmd %s ' + \
+        command_line = self.app_testpmd_path + ' %s ' + \
             '--socket-mem %s %s -- -i --nb-cores=1 --txd=%d --rxd=%d %s'
         command_line = command_line % (eal_params, self.socket_mem,
                                 vdev_params, ringsize, ringsize, extern_params)
@@ -184,7 +188,7 @@ class TestVM2VMVirtioUser(TestCase):
         """
         eal_params = self.dut.create_eal_parameters(cores='Default',
                         prefix=file_prefix, fixed_prefix=True)
-        command_line = self.target + "/app/dpdk-pdump %s -v -- " + \
+        command_line = self.app_pdump + " %s -v -- " + \
                     "--pdump  '%s,queue=*,rx-dev=%s,mbuf-size=8000'"
         self.pdump_session.send_expect(command_line % (eal_params, dump_port, filename), 'Port')
 
-- 
1.8.3.1


  parent reply index

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-08  7:17 [dts] [PATCH V1 00/38] Modify suites to support meson Zhou, Jun
2020-09-08  7:17 ` [dts] [dts 01/38] tests/TestSuite_cmdline.py: adapt to support both meson and makefile build Zhou, Jun
2020-09-08  7:17 ` [dts] [dts 02/38] tests/TestSuite_coremask.py: " Zhou, Jun
2020-09-08  7:17 ` [dts] [dts 03/38] tests/TestSuite_distributor.py: " Zhou, Jun
2020-09-08  7:17 ` [dts] [dts 04/38] tests/TestSuite_efd.py: " Zhou, Jun
2020-09-08  7:17 ` [dts] [dts 05/38] tests/TestSuite_external_memory.py: " Zhou, Jun
2020-09-08  7:17 ` [dts] [dts 06/38] tests/TestSuite_external_mempool_handler.py: " Zhou, Jun
2020-09-08  7:17 ` [dts] [dts 07/38] tests/TestSuite_flow_classify_softnic.py: " Zhou, Jun
2020-09-08  7:17 ` [dts] [dts 08/38] tests/TestSuite_hello_world.py: " Zhou, Jun
2020-09-08  7:17 ` [dts] [dts 09/38] tests/TestSuite_inline_ipsec.py: " Zhou, Jun
2020-09-08  7:17 ` [dts] [dts 10/38] tests/TestSuite_ip_pipeline.py: " Zhou, Jun
2020-09-08  7:17 ` [dts] [dts 11/38] tests/TestSuite_ipfrag.py: " Zhou, Jun
2020-09-08  7:17 ` [dts] [dts 12/38] tests/TestSuite_ipv4_reassembly.py: " Zhou, Jun
2020-09-08  7:18 ` [dts] [dts 13/38] tests/TestSuite_keep_alive.py: " Zhou, Jun
2020-09-08  7:18 ` [dts] [dts 14/38] tests/TestSuite_kni.py: " Zhou, Jun
2020-09-08  7:18 ` [dts] [dts 15/38] tests/TestSuite_l2fwd.py: " Zhou, Jun
2020-09-08  7:18 ` [dts] [dts 16/38] tests/TestSuite_l3fwdacl.py: " Zhou, Jun
2020-09-08  7:18 ` [dts] [dts 17/38] tests/TestSuite_link_status_interrupt.py: " Zhou, Jun
2020-09-08  7:18 ` [dts] [dts 18/38] tests/TestSuite_metering_and_policing.py: " Zhou, Jun
2020-09-08  7:18 ` [dts] [dts 19/38] tests/TestSuite_multicast.py: " Zhou, Jun
2020-09-08  7:18 ` [dts] [dts 20/38] tests/TestSuite_pvp_virtio_user_4k_pages.py: " Zhou, Jun
2020-09-08  7:18 ` [dts] [dts 21/38] tests/TestSuite_pvp_virtio_user_multi_queues_port_restart.py: " Zhou, Jun
2020-09-08  7:18 ` [dts] [dts 22/38] tests/TestSuite_short_live.py: " Zhou, Jun
2020-09-08  7:18 ` [dts] [dts 23/38] tests/TestSuite_skeleton.py: " Zhou, Jun
2020-09-08  7:18 ` [dts] [dts 24/38] tests/TestSuite_timer.py: " Zhou, Jun
2020-09-08  7:18 ` [dts] [dts 25/38] tests/TestSuite_userspace_ethtool.py: " Zhou, Jun
2020-09-08  7:18 ` [dts] [dts 26/38] tests/TestSuite_vdev_primary_secondary.py: " Zhou, Jun
2020-09-08  7:18 ` [dts] [dts 27/38] tests/TestSuite_vhost_pmd_xstats.py: " Zhou, Jun
2020-09-08  7:18 ` [dts] [dts 28/38] tests/TestSuite_vhost_user_interrupt.py: " Zhou, Jun
2020-09-08  7:18 ` [dts] [dts 29/38] tests/TestSuite_vhost_virtio_pmd_interrupt.py: " Zhou, Jun
2020-09-08  7:18 ` [dts] [dts 30/38] tests/TestSuite_vhost_virtio_user_interrupt.py: " Zhou, Jun
2020-09-08  7:18 ` [dts] [dts 31/38] tests/TestSuite_virtio_event_idx_interrupt.py: " Zhou, Jun
2020-09-08  7:18 ` [dts] [dts 32/38] tests/TestSuite_virtio_pvp_regression.py: " Zhou, Jun
2020-09-08  7:18 ` [dts] [dts 33/38] tests/TestSuite_virtio_user_as_exceptional_path.py: " Zhou, Jun
2020-09-08  7:18 ` [dts] [dts 34/38] tests/TestSuite_vm2vm_virtio_net_perf.py: " Zhou, Jun
2020-09-08  7:18 ` [dts] [dts 35/38] tests/TestSuite_vm2vm_virtio_pmd.py: " Zhou, Jun
2020-09-08  7:18 ` Zhou, Jun [this message]
2020-09-08  7:18 ` [dts] [dts 37/38] tests/TestSuite_vmdq.py: " Zhou, Jun
2020-09-08  7:18 ` [dts] [dts 38/38] tests/TestSuite_vxlan_sample.py: " Zhou, Jun
2020-09-08  7:34 ` [dts] [PATCH V1 00/38] Modify suites to support meson Zhou, JunX W
2020-09-08  9:05   ` Tu, Lijuan

Reply instructions:

You may reply publically to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200908071825.118583-37-junx.w.zhou@intel.com \
    --to=junx.w.zhou@intel.com \
    --cc=dts@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

test suite reviews and discussions

Archives are clonable:
	git clone --mirror http://inbox.dpdk.org/dts/0 dts/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 dts dts/ http://inbox.dpdk.org/dts \
		dts@dpdk.org
	public-inbox-index dts


Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.dts


AGPL code for this site: git clone https://public-inbox.org/ public-inbox