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 04/38] tests/TestSuite_efd.py: adapt to support both meson and makefile build
Date: Tue,  8 Sep 2020 07:17:51 +0000
Message-ID: <20200908071825.118583-5-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_efd.py | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/tests/TestSuite_efd.py b/tests/TestSuite_efd.py
index 007e03b..36df999 100644
--- a/tests/TestSuite_efd.py
+++ b/tests/TestSuite_efd.py
@@ -46,14 +46,12 @@ class TestEFD(TestCase):
         """
         self.tester.extend_external_packet_generator(TestEFD, self)
 
-        out = self.dut.build_dpdk_apps("./examples/server_node_efd")
-        self.verify("Error" not in out, "Compilation error")
-        self.verify("No such" not in out, "Compilation error")
+        self.build_server_node_efd()
 
         self.dut_ports = self.dut.get_ports()
-        self.node_app = "./examples/server_node_efd/node/%s/node" % self.target
-        self.server_app = "./examples/server_node_efd/server/%s/server" % self.target
-
+        self.node_app = self.dut.apps_name['node']
+        self.server_app = self.dut.apps_name['server']
+        self.app_test_path = self.dut.apps_name['test']
         # get dts output path
         if self.logger.log_path.startswith(os.sep):
             self.output_path = self.logger.log_path
@@ -64,6 +62,13 @@ class TestEFD(TestCase):
         # create an instance to set stream field setting
         self.pktgen_helper = PacketGeneratorHelper()
 
+    def build_server_node_efd(self):
+        apps = ['node', 'server']
+        for app in apps:
+            out = self.dut.build_dpdk_apps("./examples/server_node_efd/%s" % app)
+            self.verify("Error" not in out, "Compilation %s error" % app)
+            self.verify("No such" not in out, "Compilation %s error" % app)
+
     def set_up(self):
         """
         Run before each test case.
@@ -74,7 +79,7 @@ class TestEFD(TestCase):
         """
         Run EFD unit test
         """
-        self.dut.send_expect("./%s/app/test -n 1 -c f" % self.target, "RTE>>", 60)
+        self.dut.send_expect("./%s -n 1 -c f" % self.app_test_path, "RTE>>", 60)
         out = self.dut.send_expect("efd_autotest", "RTE>>", 120)
         self.dut.send_expect("quit", "# ")
         self.verify("Test OK" in out, "Test failed")
@@ -83,7 +88,7 @@ class TestEFD(TestCase):
         """
         Run EFD unit perf test
         """
-        self.dut.send_expect("./%s/app/test -n 1 -c f" % self.target, "RTE>>", 60)
+        self.dut.send_expect("./%s -n 1 -c f" % self.app_test_path, "RTE>>", 60)
         out = self.dut.send_expect("efd_perf_autotest", "RTE>>", 120)
         self.logger.info(out)
         self.dut.send_expect("quit", "# ")
@@ -156,9 +161,7 @@ class TestEFD(TestCase):
             # change value length and rebuild dpdk
             self.dut.send_expect("sed -i -e 's/#define RTE_EFD_VALUE_NUM_BITS .*$/#define RTE_EFD_VALUE_NUM_BITS (%d)/' lib/librte_efd/rte_efd.h" % val_bitnum, "#")
             self.dut.build_install_dpdk(self.target)
-            out = self.dut.build_dpdk_apps("./examples/server_node_efd")
-            self.verify("Error" not in out, "Compilation error")
-            self.verify("No such" not in out, "Compilation error")
+            self.build_server_node_efd()
 
             pps = self._efd_perf_evaluate(2, flow_num)
             self.result_table_add([val_bitnum, 2, "2M",  pps])
@@ -166,9 +169,7 @@ class TestEFD(TestCase):
         self.result_table_print()
         self.dut.send_expect("sed -i -e 's/#define RTE_EFD_VALUE_NUM_BITS .*$/#define RTE_EFD_VALUE_NUM_BITS (8)/' lib/librte_efd/rte_efd.h", "#")
         self.dut.build_install_dpdk(self.target)
-        out = self.dut.build_dpdk_apps("./examples/server_node_efd")
-        self.verify("Error" not in out, "Compilation error")
-        self.verify("No such" not in out, "Compilation error")
+        self.build_server_node_efd()
 
     def _efd_perf_evaluate(self, node_num, flow_num):
         # extended flow number into etgen module
-- 
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 ` Zhou, Jun [this message]
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 ` [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-5-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