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 10/38] tests/TestSuite_ip_pipeline.py: adapt to support both meson and makefile build
Date: Tue,  8 Sep 2020 07:17:57 +0000
Message-ID: <20200908071825.118583-11-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_ip_pipeline.py | 30 +++++++++++-------------------
 1 file changed, 11 insertions(+), 19 deletions(-)

diff --git a/tests/TestSuite_ip_pipeline.py b/tests/TestSuite_ip_pipeline.py
index f05b5cd..c9a473e 100644
--- a/tests/TestSuite_ip_pipeline.py
+++ b/tests/TestSuite_ip_pipeline.py
@@ -222,7 +222,8 @@ class TestIPPipeline(TestCase):
 
         out = self.dut.build_dpdk_apps("./examples/ip_pipeline")
         self.verify("Error" not in out, "Compilation error")
-
+        self.app_ip_pipline_path = self.dut.apps_name['ip_pipeline']
+        self.app_testpmd_path = self.dut.apps_name['test-pmd']
         self.param_flow_dir = self.get_flow_direction_param_of_tcpdump()
 
     def set_up(self):
@@ -244,12 +245,11 @@ class TestIPPipeline(TestCase):
         cmd = "sed -i -e 's/0000:06:00.1/%s/' ./examples/ip_pipeline/examples/route.cli" % self.dut_p3_pci
         self.dut.send_expect(cmd, "# ", 20)
 
-        IP_PIPELINE = "./examples/ip_pipeline/build/ip_pipeline"
         DUT_PORTS = " -w {0} -w {1} -w {2} -w {3} "\
                     .format(self.dut_p0_pci, self.dut_p1_pci, self.dut_p2_pci, self.dut_p3_pci)
         SCRIPT_FILE = "./examples/ip_pipeline/examples/route.cli"
 
-        cmd = "{0} -c 0x3 -n 4 {1} -- -s {2}".format(IP_PIPELINE, DUT_PORTS, SCRIPT_FILE)
+        cmd = "{0} -c 0x3 -n 4 {1} -- -s {2}".format(self.app_ip_pipline_path, DUT_PORTS, SCRIPT_FILE)
         self.dut.send_expect(cmd, "30:31:32:33:34:35", 60)
 
         #rule 0 test
@@ -313,12 +313,11 @@ class TestIPPipeline(TestCase):
         cmd = "sed -i -e 's/0000:06:00.1/%s/' ./examples/ip_pipeline/examples/firewall.cli" % self.dut_p3_pci
         self.dut.send_expect(cmd, "# ", 20)
 
-        IP_PIPELINE = "./examples/ip_pipeline/build/ip_pipeline"
         DUT_PORTS = " -w {0} -w {1} -w {2} -w {3} "\
                     .format(self.dut_p0_pci, self.dut_p1_pci, self.dut_p2_pci, self.dut_p3_pci)
         SCRIPT_FILE = "./examples/ip_pipeline/examples/firewall.cli"
 
-        cmd = "{0} -c 0x3 -n 4 {1} -- -s {2}".format(IP_PIPELINE, DUT_PORTS, SCRIPT_FILE)
+        cmd = "{0} -c 0x3 -n 4 {1} -- -s {2}".format(self.app_ip_pipline_path, DUT_PORTS, SCRIPT_FILE)
         self.dut.send_expect(cmd, "fwd port 3", 60)
 
         #rule 0 test
@@ -382,12 +381,11 @@ class TestIPPipeline(TestCase):
         cmd = "sed -i -e 's/0000:06:00.1/%s/' ./examples/ip_pipeline/examples/flow.cli" % self.dut_p3_pci
         self.dut.send_expect(cmd, "# ", 20)
 
-        IP_PIPELINE = "./examples/ip_pipeline/build/ip_pipeline"
         DUT_PORTS = " -w {0} -w {1} -w {2} -w {3} "\
                     .format(self.dut_p0_pci, self.dut_p1_pci, self.dut_p2_pci, self.dut_p3_pci)
         SCRIPT_FILE = "./examples/ip_pipeline/examples/flow.cli"
 
-        cmd = "{0} -c 0x3 -n 4 {1} -- -s {2}".format(IP_PIPELINE, DUT_PORTS, SCRIPT_FILE)
+        cmd = "{0} -c 0x3 -n 4 {1} -- -s {2}".format(self.app_ip_pipline_path, DUT_PORTS, SCRIPT_FILE)
         self.dut.send_expect(cmd, "fwd port 3", 60)
 
         #rule 0 test
@@ -451,12 +449,11 @@ class TestIPPipeline(TestCase):
         cmd = "sed -i -e 's/0000:06:00.1/%s/' ./examples/ip_pipeline/examples/l2fwd.cli" % self.dut_p3_pci
         self.dut.send_expect(cmd, "# ", 20)
 
-        IP_PIPELINE = "./examples/ip_pipeline/build/ip_pipeline"
         DUT_PORTS = " -w {0} -w {1} -w {2} -w {3} "\
                     .format(self.dut_p0_pci, self.dut_p1_pci, self.dut_p2_pci, self.dut_p3_pci)
         SCRIPT_FILE = "./examples/ip_pipeline/examples/l2fwd.cli"
 
-        cmd = "{0} -c 0x3 -n 4 {1} -- -s {2}".format(IP_PIPELINE, DUT_PORTS, SCRIPT_FILE)
+        cmd = "{0} -c 0x3 -n 4 {1} -- -s {2}".format(self.app_ip_pipline_path, DUT_PORTS, SCRIPT_FILE)
         self.dut.send_expect(cmd, "fwd port 2", 60)
 
         #rule 0 test
@@ -522,8 +519,6 @@ class TestIPPipeline(TestCase):
         cmd = "sed -i '/mempool MEMPOOL0/a\link LINK0 dev %s rxq 1 128 MEMPOOL0 txq 1 512 promiscuous on' ./examples/ip_pipeline/examples/l2fwd.cli" % self.sriov_vfs_port[0][0].pci
         self.dut.send_expect(cmd, "# ", 20)
 
-        TESTPMD = "./%s/app/testpmd" % self.target
-        IP_PIPELINE = "./examples/ip_pipeline/build/ip_pipeline"
         DUT_PF_PORTS = " -w {0} -w {1} -w {2} -w {3} "\
                     .format(self.dut_p0_pci, self.dut_p1_pci, self.dut_p2_pci, self.dut_p3_pci)
         PF_SCRIPT_FILE = "--file-prefix=pf --socket-mem 1024,1024"
@@ -532,14 +527,14 @@ class TestIPPipeline(TestCase):
                     .format(self.sriov_vfs_port[0][0].pci, self.sriov_vfs_port[1][0].pci, self.sriov_vfs_port[2][0].pci, self.sriov_vfs_port[3][0].pci)
         VF_SCRIPT_FILE = "./examples/ip_pipeline/examples/l2fwd.cli"
 
-        pf_cmd = "{0} -c 0xf0 -n 4 {1} {2} -- -i".format(TESTPMD, DUT_PF_PORTS, PF_SCRIPT_FILE)
+        pf_cmd = "{0} -c 0xf0 -n 4 {1} {2} -- -i".format(self.app_testpmd_path, DUT_PF_PORTS, PF_SCRIPT_FILE)
         self.dut.send_expect(pf_cmd, "testpmd> ", 60)
         self.dut.send_expect("set vf mac addr 0 0 %s" % self.vf0_mac, "testpmd> ", 30)
         self.dut.send_expect("set vf mac addr 1 0 %s" % self.vf1_mac, "testpmd> ", 30)
         self.dut.send_expect("set vf mac addr 2 0 %s" % self.vf2_mac, "testpmd> ", 30)
         self.dut.send_expect("set vf mac addr 3 0 %s" % self.vf3_mac, "testpmd> ", 30)
 
-        vf_cmd = "{0} -c 0x3 -n 4 {1} -- -s {2}".format(IP_PIPELINE, DUT_VF_PORTS, VF_SCRIPT_FILE)
+        vf_cmd = "{0} -c 0x3 -n 4 {1} -- -s {2}".format(self.app_ip_pipline_path, DUT_VF_PORTS, VF_SCRIPT_FILE)
         self.session_secondary.send_expect(vf_cmd, "fwd port 2", 60)
 
         #rule 0 test
@@ -604,12 +599,11 @@ class TestIPPipeline(TestCase):
         cmd = "sed -i '/mempool MEMPOOL0/a\link LINK0 dev %s rxq 1 128 MEMPOOL0 txq 1 512 promiscuous on' ./examples/ip_pipeline/examples/l2fwd.cli" % self.sriov_vfs_port[0][0].pci
         self.dut.send_expect(cmd, "# ", 20)
 
-        IP_PIPELINE = "./examples/ip_pipeline/build/ip_pipeline"
         DUT_VF_PORTS = " -w {0} -w {1} -w {2} -w {3} "\
                     .format(self.sriov_vfs_port[0][0].pci, self.sriov_vfs_port[1][0].pci, self.sriov_vfs_port[2][0].pci, self.sriov_vfs_port[3][0].pci)
         VF_SCRIPT_FILE = "./examples/ip_pipeline/examples/l2fwd.cli"
 
-        vf_cmd = "{0} -c 0x3 -n 4 {1} -- -s {2}".format(IP_PIPELINE, DUT_VF_PORTS, VF_SCRIPT_FILE)
+        vf_cmd = "{0} -c 0x3 -n 4 {1} -- -s {2}".format(self.app_ip_pipline_path, DUT_VF_PORTS, VF_SCRIPT_FILE)
         self.session_secondary.send_expect(vf_cmd, "fwd port 2", 60)
 
         #rule 0 test
@@ -671,12 +665,11 @@ class TestIPPipeline(TestCase):
         cmd = "sed -i -e 's/0000:02:00.1/%s/' ./examples/ip_pipeline/examples/tap.cli" % self.dut_p1_pci
         self.dut.send_expect(cmd, "# ", 20)
 
-        IP_PIPELINE = "./examples/ip_pipeline/build/ip_pipeline"
         DUT_PORTS = " -w {0} -w {1} "\
                     .format(self.dut_p0_pci, self.dut_p1_pci)
         SCRIPT_FILE = "./examples/ip_pipeline/examples/tap.cli"
 
-        cmd = "{0} -c 0x3 -n 4 {1} -- -s {2}".format(IP_PIPELINE, DUT_PORTS, SCRIPT_FILE)
+        cmd = "{0} -c 0x3 -n 4 {1} -- -s {2}".format(self.app_ip_pipline_path, DUT_PORTS, SCRIPT_FILE)
         self.dut.send_expect(cmd, "fwd port 3", 60)
 
         tap_session = self.dut.new_session()
@@ -729,12 +722,11 @@ class TestIPPipeline(TestCase):
         cmd = "sed -i -e 's/0000:06:00.1/%s/' ./examples/ip_pipeline/examples/rss.cli" % self.dut_p3_pci
         self.dut.send_expect(cmd, "# ", 20)
 
-        IP_PIPELINE = "./examples/ip_pipeline/build/ip_pipeline"
         DUT_PORTS = " -w {0} -w {1} -w {2} -w {3} "\
                     .format(self.dut_p0_pci, self.dut_p1_pci, self.dut_p2_pci, self.dut_p3_pci)
         SCRIPT_FILE = "./examples/ip_pipeline/examples/rss.cli"
 
-        cmd = "{0} -c 0x1f -n 4 {1} -- -s {2}".format(IP_PIPELINE, DUT_PORTS, SCRIPT_FILE)
+        cmd = "{0} -c 0x1f -n 4 {1} -- -s {2}".format(self.app_ip_pipline_path, DUT_PORTS, SCRIPT_FILE)
         self.dut.send_expect(cmd, "PIPELINE3 enable", 60)
 
         #rule 0 test
-- 
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 ` Zhou, Jun [this message]
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 ` [dts] [dts 36/38] tests/TestSuite_vm2vm_virtio_user.py: " Zhou, Jun
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-11-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