test suite reviews and discussions
 help / color / Atom feed
* [dts] [PATCH V1 00/10] Modify suites to support meson
@ 2020-09-16 12:29 Zhou, Jun
  2020-09-16 12:29 ` [dts] [PATCH V1 01/10] tests/TestSuite_ddp_gtp_qregion.py: Instead of getting the rxq&txq value from common_base to rte_config.h Zhou, Jun
                   ` (11 more replies)
  0 siblings, 12 replies; 14+ messages in thread
From: Zhou, Jun @ 2020-09-16 12:29 UTC (permalink / raw)
  To: dts; +Cc: Zhou, Jun

Modify suites to support meson

*** BLURB HERE ***

Zhou, Jun (10):
  tests/TestSuite_ddp_gtp_qregion.py: Instead of getting the rxq&txq
    value from common_base to rte_config.h
  tests/TestSuite_ddp_l2tpv3.py: Instead of getting the rxq&txq value
    from common_base to rte_config.h
  tests/TestSuite_ddp_ppp_l2tp.py: Instead of getting the rxq&txq value
    from common_base to rte_config.h
  tests/TestSuite_dynamic_flowtype.py: Instead of getting the rxq&txq
    value from common_base to rte_config.h
  tests/TestSuite_dynamic_queue.py: Instead of getting the rxq&txq value
    from common_base to rte_config.h
  tests/TestSuite_ipv4_reassembly.py: change mode of set parameter to
    adapt meson build
  tests/TestSuite_qinq_filter.py: change mode of set parameter to adapt
    meson build
  tests/TestSuite_queue_start_stop.py:adapt to support both meson and
    makefile build
  tests/tests/TestSuite_rxtx_callbacks.py:adapt to support both meson
    and makefile build
  tests/TestSuite_ddp_gtp.py: adapt to support both meson and makefile
    build

 tests/TestSuite_ddp_gtp.py          | 13 +++++--------
 tests/TestSuite_ddp_gtp_qregion.py  |  6 +++---
 tests/TestSuite_ddp_l2tpv3.py       |  7 +++----
 tests/TestSuite_ddp_ppp_l2tp.py     |  6 +++---
 tests/TestSuite_dynamic_flowtype.py |  6 +++---
 tests/TestSuite_dynamic_queue.py    | 12 ++++++------
 tests/TestSuite_ipv4_reassembly.py  |  7 +++----
 tests/TestSuite_qinq_filter.py      |  7 ++-----
 tests/TestSuite_queue_start_stop.py |  5 +++--
 tests/TestSuite_rxtx_callbacks.py   |  4 ++--
 10 files changed, 33 insertions(+), 40 deletions(-)

-- 
2.25.1


^ permalink raw reply	[flat|nested] 14+ messages in thread

* [dts] [PATCH V1 01/10] tests/TestSuite_ddp_gtp_qregion.py: Instead of getting the rxq&txq value from common_base to rte_config.h
  2020-09-16 12:29 [dts] [PATCH V1 00/10] Modify suites to support meson Zhou, Jun
@ 2020-09-16 12:29 ` Zhou, Jun
  2020-09-16 12:29 ` [dts] [PATCH V1 02/10] tests/TestSuite_ddp_l2tpv3.py: " Zhou, Jun
                   ` (10 subsequent siblings)
  11 siblings, 0 replies; 14+ messages in thread
From: Zhou, Jun @ 2020-09-16 12:29 UTC (permalink / raw)
  To: dts; +Cc: Zhou, Jun, Zhou

Instead of getting the rxq&txq value from common_base to rte_config.h

Signed-off-by: Zhou, Jun <junx.w.zhou@intel.com>
---
 tests/TestSuite_ddp_gtp_qregion.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/TestSuite_ddp_gtp_qregion.py b/tests/TestSuite_ddp_gtp_qregion.py
index 5ef708eb..efa4a18a 100644
--- a/tests/TestSuite_ddp_gtp_qregion.py
+++ b/tests/TestSuite_ddp_gtp_qregion.py
@@ -18,9 +18,9 @@ class TestDdpGtpQregion(TestCase):
         profile_file = 'dep/gtp.pkgo'
         profile_dst = "/tmp/"
         self.dut.session.copy_file_to(profile_file, profile_dst)
-        out = self.dut.send_expect("cat config/common_base", "]# ", 10)
-        self.PF_Q_strip = 'CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_PF'
-        pattern = "(%s=)(\d*)" % self.PF_Q_strip
+        out = self.dut.send_expect("cat config/rte_config.h", "]# ", 10)
+        self.PF_Q_strip = 'RTE_LIBRTE_I40E_QUEUE_NUM_PER_PF'
+        pattern = "define (%s) (\d*)" % self.PF_Q_strip
         self.PF_QUEUE = self.element_strip(out, pattern)
         self.used_dut_port = self.dut_ports[0]
         tester_port = self.tester.get_local_port(self.used_dut_port)
-- 
2.25.1


^ permalink raw reply	[flat|nested] 14+ messages in thread

* [dts] [PATCH V1 02/10] tests/TestSuite_ddp_l2tpv3.py: Instead of getting the rxq&txq value from common_base to rte_config.h
  2020-09-16 12:29 [dts] [PATCH V1 00/10] Modify suites to support meson Zhou, Jun
  2020-09-16 12:29 ` [dts] [PATCH V1 01/10] tests/TestSuite_ddp_gtp_qregion.py: Instead of getting the rxq&txq value from common_base to rte_config.h Zhou, Jun
@ 2020-09-16 12:29 ` " Zhou, Jun
  2020-09-16 12:29 ` [dts] [PATCH V1 03/10] tests/TestSuite_ddp_ppp_l2tp.py: " Zhou, Jun
                   ` (9 subsequent siblings)
  11 siblings, 0 replies; 14+ messages in thread
From: Zhou, Jun @ 2020-09-16 12:29 UTC (permalink / raw)
  To: dts; +Cc: Zhou, Jun, Zhou

Instead of getting the rxq&txq value from common_base to rte_config.h

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

diff --git a/tests/TestSuite_ddp_l2tpv3.py b/tests/TestSuite_ddp_l2tpv3.py
index da734f31..22ae0be7 100644
--- a/tests/TestSuite_ddp_l2tpv3.py
+++ b/tests/TestSuite_ddp_l2tpv3.py
@@ -50,11 +50,10 @@ class TestDdpL2tpv3(TestCase):
         self.used_dut_port = self.dut_ports[0]
         tester_port = self.tester.get_local_port(self.used_dut_port)
         self.tester_intf = self.tester.get_interface(tester_port)
-        out = self.dut.send_expect("cat config/common_base", "]# ", 10)
-        self.PF_Q_strip = 'CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_PF'
-        pattern = "(%s=)(\d*)" % self.PF_Q_strip
+        out = self.dut.send_expect("cat config/rte_config.h", "]# ", 10)
+        self.PF_Q_strip = 'RTE_LIBRTE_I40E_QUEUE_NUM_PER_PF'
+        pattern = "define (%s) (\d*)" % self.PF_Q_strip
         self.PF_QUEUE = self.element_strip(out, pattern)
-        self.PF_Q_strip = 'CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_PF'
 
     def set_up(self):
         self.load_profile()
-- 
2.25.1


^ permalink raw reply	[flat|nested] 14+ messages in thread

* [dts] [PATCH V1 03/10] tests/TestSuite_ddp_ppp_l2tp.py: Instead of getting the rxq&txq value from common_base to rte_config.h
  2020-09-16 12:29 [dts] [PATCH V1 00/10] Modify suites to support meson Zhou, Jun
  2020-09-16 12:29 ` [dts] [PATCH V1 01/10] tests/TestSuite_ddp_gtp_qregion.py: Instead of getting the rxq&txq value from common_base to rte_config.h Zhou, Jun
  2020-09-16 12:29 ` [dts] [PATCH V1 02/10] tests/TestSuite_ddp_l2tpv3.py: " Zhou, Jun
@ 2020-09-16 12:29 ` " Zhou, Jun
  2020-09-16 12:29 ` [dts] [PATCH V1 04/10] tests/TestSuite_dynamic_flowtype.py: " Zhou, Jun
                   ` (8 subsequent siblings)
  11 siblings, 0 replies; 14+ messages in thread
From: Zhou, Jun @ 2020-09-16 12:29 UTC (permalink / raw)
  To: dts; +Cc: Zhou, Jun, Zhou

Instead of getting the rxq&txq value from common_base to rte_config.h

Signed-off-by: Zhou, Jun <junx.w.zhou@intel.com>
---
 tests/TestSuite_ddp_ppp_l2tp.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/TestSuite_ddp_ppp_l2tp.py b/tests/TestSuite_ddp_ppp_l2tp.py
index e5a19773..0ec4191d 100644
--- a/tests/TestSuite_ddp_ppp_l2tp.py
+++ b/tests/TestSuite_ddp_ppp_l2tp.py
@@ -19,9 +19,9 @@ class TestDdpPppL2tp(TestCase):
         profile_file = 'dep/ppp-oe-ol2tpv2.pkgo'
         profile_dst = "/tmp/"
         self.dut.session.copy_file_to(profile_file, profile_dst)
-        out = self.dut.send_expect("cat config/common_base", "]# ", 10)
-        self.PF_Q_strip = 'CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_PF'
-        pattern = "(%s=)(\d*)" % self.PF_Q_strip
+        out = self.dut.send_expect("cat config/rte_config.h", "]# ", 10)
+        self.PF_Q_strip = 'RTE_LIBRTE_I40E_QUEUE_NUM_PER_PF'
+        pattern = "define (%s) (\d*)" % self.PF_Q_strip
         self.PF_QUEUE = self.element_strip(out, pattern)
         self.used_dut_port = self.dut_ports[0]
         tester_port = self.tester.get_local_port(self.used_dut_port)
-- 
2.25.1


^ permalink raw reply	[flat|nested] 14+ messages in thread

* [dts] [PATCH V1 04/10] tests/TestSuite_dynamic_flowtype.py: Instead of getting the rxq&txq value from common_base to rte_config.h
  2020-09-16 12:29 [dts] [PATCH V1 00/10] Modify suites to support meson Zhou, Jun
                   ` (2 preceding siblings ...)
  2020-09-16 12:29 ` [dts] [PATCH V1 03/10] tests/TestSuite_ddp_ppp_l2tp.py: " Zhou, Jun
@ 2020-09-16 12:29 ` " Zhou, Jun
  2020-09-16 12:29 ` [dts] [PATCH V1 05/10] tests/TestSuite_dynamic_queue.py: " Zhou, Jun
                   ` (7 subsequent siblings)
  11 siblings, 0 replies; 14+ messages in thread
From: Zhou, Jun @ 2020-09-16 12:29 UTC (permalink / raw)
  To: dts; +Cc: Zhou, Jun, Zhou

Instead of getting the rxq&txq value from common_base to rte_config.h

Signed-off-by: Zhou, Jun <junx.w.zhou@intel.com>
---
 tests/TestSuite_dynamic_flowtype.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/TestSuite_dynamic_flowtype.py b/tests/TestSuite_dynamic_flowtype.py
index b12a4290..90b53167 100644
--- a/tests/TestSuite_dynamic_flowtype.py
+++ b/tests/TestSuite_dynamic_flowtype.py
@@ -24,7 +24,7 @@ class TestDynamicFlowtype(TestCase):
         profile_file = 'dep/gtp.pkgo'
         profile_dst = "/tmp/"
         self.dut.session.copy_file_to(profile_file, profile_dst)
-        PF_Q_strip = 'CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_PF'
+        PF_Q_strip = 'RTE_LIBRTE_I40E_QUEUE_NUM_PER_PF'
         self.PF_QUEUE = self.search_queue_number(PF_Q_strip)
 
     def set_up(self):
@@ -41,8 +41,8 @@ class TestDynamicFlowtype(TestCase):
         """
         Search max queue number from configuration.
         """
-        out = self.dut.send_expect("cat config/common_base", "]# ", 10)
-        pattern = "(%s=)(\d*)" % Q_strip
+        out = self.dut.send_expect("cat config/rte_config.h", "]# ", 10)
+        pattern = "define (%s) (\d*)" % Q_strip
         s = re.compile(pattern)
         res = s.search(out)
         if res is None:
-- 
2.25.1


^ permalink raw reply	[flat|nested] 14+ messages in thread

* [dts] [PATCH V1 05/10] tests/TestSuite_dynamic_queue.py: Instead of getting the rxq&txq value from common_base to rte_config.h
  2020-09-16 12:29 [dts] [PATCH V1 00/10] Modify suites to support meson Zhou, Jun
                   ` (3 preceding siblings ...)
  2020-09-16 12:29 ` [dts] [PATCH V1 04/10] tests/TestSuite_dynamic_flowtype.py: " Zhou, Jun
@ 2020-09-16 12:29 ` " Zhou, Jun
  2020-09-16 12:29 ` [dts] [PATCH V1 06/10] tests/TestSuite_ipv4_reassembly.py: change mode of set parameter to adapt meson build Zhou, Jun
                   ` (6 subsequent siblings)
  11 siblings, 0 replies; 14+ messages in thread
From: Zhou, Jun @ 2020-09-16 12:29 UTC (permalink / raw)
  To: dts; +Cc: Zhou, Jun, Zhou

Instead of getting the rxq&txq value from common_base to rte_config.h

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

diff --git a/tests/TestSuite_dynamic_queue.py b/tests/TestSuite_dynamic_queue.py
index 356ebfd6..bdf226a0 100644
--- a/tests/TestSuite_dynamic_queue.py
+++ b/tests/TestSuite_dynamic_queue.py
@@ -17,10 +17,10 @@ class TestDynamicQueue(TestCase):
     def set_up_all(self):
         self.dut_ports = self.dut.get_ports(self.nic)
         self.verify(len(self.dut_ports) >= 1, "Insufficient ports")
-        out = self.dut.send_expect("cat config/common_base", "]# ", 10)
-        self.PF_Q_strip = 'CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_PF'
-        pattern = "%s=(\d*)" % self.PF_Q_strip
-        self.PF_QUEUE = self.element_strip(out, pattern)
+        out = self.dut.send_expect("cat config/rte_config.h", "]# ", 10)
+        self.PF_Q_strip = 'RTE_LIBRTE_I40E_QUEUE_NUM_PER_PF'
+        pattern = "define (%s) (\d*)" % self.PF_Q_strip
+        self.PF_QUEUE = self.element_strip(out, pattern, True)
         self.used_dut_port = self.dut_ports[0]
         tester_port = self.tester.get_local_port(self.used_dut_port)
         self.tester_intf = self.tester.get_interface(tester_port)
@@ -45,7 +45,7 @@ class TestDynamicQueue(TestCase):
                 "Default", "--port-topology=chained --txq=%s --rxq=%s"
                 % (self.PF_QUEUE, self.PF_QUEUE))
 
-    def element_strip(self, out, pattern):
+    def element_strip(self, out, pattern, if_get_from_cfg=False):
         """
         Strip and get queue number.
         """
@@ -55,7 +55,7 @@ class TestDynamicQueue(TestCase):
             print((utils.RED('Fail to search number.')))
             return None
         else:
-            result = res.group(1)
+            result = res.group(2) if if_get_from_cfg else res.group(1)
             return int(result)
 
     def send_packet(self):
-- 
2.25.1


^ permalink raw reply	[flat|nested] 14+ messages in thread

* [dts] [PATCH V1 06/10] tests/TestSuite_ipv4_reassembly.py: change mode of set parameter to adapt meson build
  2020-09-16 12:29 [dts] [PATCH V1 00/10] Modify suites to support meson Zhou, Jun
                   ` (4 preceding siblings ...)
  2020-09-16 12:29 ` [dts] [PATCH V1 05/10] tests/TestSuite_dynamic_queue.py: " Zhou, Jun
@ 2020-09-16 12:29 ` Zhou, Jun
  2020-09-17  8:40   ` Ma, LihongX
  2020-09-16 12:29 ` [dts] [PATCH V1 07/10] tests/TestSuite_qinq_filter.py: " Zhou, Jun
                   ` (5 subsequent siblings)
  11 siblings, 1 reply; 14+ messages in thread
From: Zhou, Jun @ 2020-09-16 12:29 UTC (permalink / raw)
  To: dts; +Cc: Zhou, Jun, Zhou

change mode of set parameter to adapt meson build

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

diff --git a/tests/TestSuite_ipv4_reassembly.py b/tests/TestSuite_ipv4_reassembly.py
index e3df14e6..b653bbe4 100644
--- a/tests/TestSuite_ipv4_reassembly.py
+++ b/tests/TestSuite_ipv4_reassembly.py
@@ -92,8 +92,7 @@ class TestIpReassembly(TestCase):
         """
         Changes the maximum number of frames by modifying the example app code.
         """
-        self.dut.send_expect(
-            "sed -i -e 's/CONFIG_RTE_LIBRTE_IP_FRAG_MAX_FRAG=.*$/CONFIG_RTE_LIBRTE_IP_FRAG_MAX_FRAG=%s/' ./config/common_base" % int(num_of_fragments), "# ")
+        self.dut.set_build_options({'RTE_LIBRTE_IP_FRAG_MAX_FRAG': int(num_of_fragments)})
         self.dut.send_expect("export RTE_TARGET=" + self.target, "#")
         self.dut.send_expect("export RTE_SDK=`pwd`", "#")
         self.dut.send_expect("rm -rf %s" % self.target, "# ", 5)
@@ -511,7 +510,7 @@ class TestIpReassembly(TestCase):
         self.test_config = IpReassemblyTestConfig(self,
                                                   number_of_frames=1,
                                                   flowttl='3s')
-
+        self.compile_example_app()
         self.execute_example_app()
         self.tcpdump_start_sniffing()
 
@@ -540,13 +539,13 @@ class TestIpReassembly(TestCase):
         Sends 1K jumbo frames using the right configuration.
         Expects all the frames to be forwarded back.
         """
-
         mtu = 9000
         self.test_config = IpReassemblyTestConfig(self,
                                                   payload_size=mtu - 100,
                                                   fragment_size=2500)
         try:
             self.set_tester_iface_mtu(self.test_config.tester_iface, mtu)
+            self.compile_example_app()
             self.execute_example_app()
             self.send_n_siff_packets()
             self.verify_all()
-- 
2.25.1


^ permalink raw reply	[flat|nested] 14+ messages in thread

* [dts] [PATCH V1 07/10] tests/TestSuite_qinq_filter.py: change mode of set parameter to adapt meson build
  2020-09-16 12:29 [dts] [PATCH V1 00/10] Modify suites to support meson Zhou, Jun
                   ` (5 preceding siblings ...)
  2020-09-16 12:29 ` [dts] [PATCH V1 06/10] tests/TestSuite_ipv4_reassembly.py: change mode of set parameter to adapt meson build Zhou, Jun
@ 2020-09-16 12:29 ` " Zhou, Jun
  2020-09-16 12:29 ` [dts] [PATCH V1 08/10] tests/TestSuite_queue_start_stop.py:adapt to support both meson and makefile build Zhou, Jun
                   ` (4 subsequent siblings)
  11 siblings, 0 replies; 14+ messages in thread
From: Zhou, Jun @ 2020-09-16 12:29 UTC (permalink / raw)
  To: dts; +Cc: Zhou, Jun, Zhou

change mode of set parameter to adapt meson build

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

diff --git a/tests/TestSuite_qinq_filter.py b/tests/TestSuite_qinq_filter.py
index 086abc17..91a2d7a5 100644
--- a/tests/TestSuite_qinq_filter.py
+++ b/tests/TestSuite_qinq_filter.py
@@ -72,9 +72,7 @@ class TestQinqFilter(TestCase):
         
         cores = self.dut.get_core_list('1S/2C/1T')
         self.coreMask = utils.create_mask(cores)
-        
-        self.dut.send_expect("sed -i -e 's/CONFIG_RTE_LIBRTE_I40E_INC_VECTOR=.*$/"
-                           + "CONFIG_RTE_LIBRTE_I40E_INC_VECTOR=n/' config/common_base", "# ", 30)
+        self.dut.set_build_options({'RTE_LIBRTE_I40E_INC_VECTOR': 'n'})
         self.dut.build_install_dpdk(self.target)
         self.path=self.dut.apps_name['test-pmd']
         
@@ -350,6 +348,5 @@ class TestQinqFilter(TestCase):
         """
         Run after each test suite.
         """
-        self.dut.send_expect("sed -i -e 's/CONFIG_RTE_LIBRTE_I40E_INC_VECTOR=.*$/"
-                           + "CONFIG_RTE_LIBRTE_I40E_INC_VECTOR=y/' config/common_base", "# ", 30)
+        self.dut.set_build_options({'RTE_LIBRTE_I40E_INC_VECTOR': 'y'})
         self.dut.build_install_dpdk(self.target)
-- 
2.25.1


^ permalink raw reply	[flat|nested] 14+ messages in thread

* [dts] [PATCH V1 08/10] tests/TestSuite_queue_start_stop.py:adapt to support both meson and makefile build
  2020-09-16 12:29 [dts] [PATCH V1 00/10] Modify suites to support meson Zhou, Jun
                   ` (6 preceding siblings ...)
  2020-09-16 12:29 ` [dts] [PATCH V1 07/10] tests/TestSuite_qinq_filter.py: " Zhou, Jun
@ 2020-09-16 12:29 ` Zhou, Jun
  2020-09-16 12:29 ` [dts] [PATCH V1 09/10] tests/tests/TestSuite_rxtx_callbacks.py:adapt " Zhou, Jun
                   ` (3 subsequent siblings)
  11 siblings, 0 replies; 14+ messages in thread
From: Zhou, Jun @ 2020-09-16 12:29 UTC (permalink / raw)
  To: dts; +Cc: Zhou, Jun, Zhou

adapt to support both meson and makefile build

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

diff --git a/tests/TestSuite_queue_start_stop.py b/tests/TestSuite_queue_start_stop.py
index cb59c951..77b25607 100644
--- a/tests/TestSuite_queue_start_stop.py
+++ b/tests/TestSuite_queue_start_stop.py
@@ -65,6 +65,7 @@ class TestQueueStartStop(TestCase):
         """
         self.ports = self.dut.get_ports(self.nic)
         self.verify(len(self.ports) >= 1, "Insufficient number of ports.")
+        self.app_testpmd_path = self.dut.apps_name['test-pmd']
 
     def set_up(self):
         """
@@ -82,7 +83,7 @@ class TestQueueStartStop(TestCase):
         try:
             self.dut.session.copy_file_to(patch_file, patch_dst)
             self.patch_hotfix_dpdk(patch_dst + "macfwd_log.patch", True)
-            self.dut.build_dpdk_apps('./app/test-pmd')
+            self.dut.build_install_dpdk(self.target)
         except Exception as e:
             raise IOError("dpdk setup failure: %s" % e)
 
@@ -130,7 +131,7 @@ class TestQueueStartStop(TestCase):
         """
         #dpdk start
         try:
-            self.dut.send_expect("./app/test-pmd/testpmd -c 0xf -n 4 -- -i --portmask=0x1 --port-topology=loop", "testpmd>", 120)
+            self.dut.send_expect("%s -c 0xf -n 4 -- -i --portmask=0x1 --port-topology=loop" % self.app_testpmd_path, "testpmd>", 120)
             time.sleep(5)
             self.dut.send_expect("set fwd mac", "testpmd>")
             self.dut.send_expect("start", "testpmd>")
-- 
2.25.1


^ permalink raw reply	[flat|nested] 14+ messages in thread

* [dts] [PATCH V1 09/10] tests/tests/TestSuite_rxtx_callbacks.py:adapt to support both meson and makefile build
  2020-09-16 12:29 [dts] [PATCH V1 00/10] Modify suites to support meson Zhou, Jun
                   ` (7 preceding siblings ...)
  2020-09-16 12:29 ` [dts] [PATCH V1 08/10] tests/TestSuite_queue_start_stop.py:adapt to support both meson and makefile build Zhou, Jun
@ 2020-09-16 12:29 ` " Zhou, Jun
  2020-09-16 12:29 ` [dts] [PATCH 10/10] tests/TestSuite_ddp_gtp.py: adapt " Zhou, Jun
                   ` (2 subsequent siblings)
  11 siblings, 0 replies; 14+ messages in thread
From: Zhou, Jun @ 2020-09-16 12:29 UTC (permalink / raw)
  To: dts; +Cc: Zhou, Jun, Zhou

adapt to support both meson and makefile build

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

diff --git a/tests/TestSuite_rxtx_callbacks.py b/tests/TestSuite_rxtx_callbacks.py
index a2da0d94..33a1bb00 100644
--- a/tests/TestSuite_rxtx_callbacks.py
+++ b/tests/TestSuite_rxtx_callbacks.py
@@ -54,7 +54,7 @@ class TestRxtxCallbacks(TestCase):
         self.coremask = utils.create_mask(cores)
         
         self.mac = self.dut.get_mac_address(self.dut_ports[0])
-        self.path = "./examples/rxtx_callbacks/build/rxtx_callbacks"
+        self.app_rxtx_callbacks_path = self.dut.apps_name['rxtx_callbacks']
 
         out = self.dut.build_dpdk_apps("./examples/rxtx_callbacks")
         self.verify("Error" not in out, "compilation error 1")
@@ -67,7 +67,7 @@ class TestRxtxCallbacks(TestCase):
         pass
 
     def test_rxtx_callbacks(self):
-        cmd = self.path + " -c %s -n %d " % (self.coremask,self.dut.get_memory_channels())
+        cmd = self.app_rxtx_callbacks_path + " -c %s -n %d " % (self.coremask,self.dut.get_memory_channels())
         self.dut.send_expect(cmd,"forwarding packets",60)
          
         self.iface_port0 = self.tester.get_interface(self.tester.get_local_port(self.dut_ports[0]))
-- 
2.25.1


^ permalink raw reply	[flat|nested] 14+ messages in thread

* [dts] [PATCH 10/10] tests/TestSuite_ddp_gtp.py: adapt to support both meson and makefile build
  2020-09-16 12:29 [dts] [PATCH V1 00/10] Modify suites to support meson Zhou, Jun
                   ` (8 preceding siblings ...)
  2020-09-16 12:29 ` [dts] [PATCH V1 09/10] tests/tests/TestSuite_rxtx_callbacks.py:adapt " Zhou, Jun
@ 2020-09-16 12:29 ` " Zhou, Jun
  2020-09-17  2:19 ` [dts] [PATCH V1 00/10] Modify suites to support meson Zhou, JunX W
  2020-09-23  8:43 ` Tu, Lijuan
  11 siblings, 0 replies; 14+ messages in thread
From: Zhou, Jun @ 2020-09-16 12:29 UTC (permalink / raw)
  To: dts; +Cc: Zhou, Jun, Zhou

adapt to support both meson and makefile build

Signed-off-by: Zhou, Jun <junx.w.zhou@intel.com>
---
 tests/TestSuite_ddp_gtp.py | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/tests/TestSuite_ddp_gtp.py b/tests/TestSuite_ddp_gtp.py
index 972c4016..11fe7cb8 100644
--- a/tests/TestSuite_ddp_gtp.py
+++ b/tests/TestSuite_ddp_gtp.py
@@ -27,7 +27,7 @@ class TestDdpGtp(TestCase):
         profile_file = 'dep/gtp.pkgo'
         profile_dst = "/tmp/"
         self.dut.session.copy_file_to(profile_file, profile_dst)
-        self.PF_Q_strip = 'CONFIG_RTE_LIBRTE_I40E_QUEUE_NUM_PER_PF'
+        self.PF_Q_strip = 'RTE_LIBRTE_I40E_QUEUE_NUM_PER_PF'
         # commit ee653bd8, queue number of per vf default value is defined
         # in drivers/net/i40e/i40e_ethdev.c, named as RTE_LIBRTE_I40E_QUEUE_NUM_PER_VF
         self.VF_Q_strip = 'RTE_LIBRTE_I40E_QUEUE_NUM_PER_VF'
@@ -43,6 +43,7 @@ class TestDdpGtp(TestCase):
         else:
             self.vf_assign_method = 'vfio-pci'
             self.dut.send_expect('modprobe vfio-pci', '#')
+
     def insmod_modprobe(self,modename=''):
         """
         Insmod modProbe before run test case
@@ -76,15 +77,14 @@ class TestDdpGtp(TestCase):
         else:
             self.load_profile()
 
-
     def search_queue_number(self, Q_strip):
         """
         Search max queue number from configuration.
         """
         if Q_strip is self.PF_Q_strip:
-            out = self.dut.send_expect("cat config/common_base", "]# ", 10)
-            pattern = "(%s=)(\d*)" % Q_strip
-        else :
+            out = self.dut.send_expect("cat config/rte_config.h", "]# ", 10)
+            pattern = "define (%s) (\d*)" % Q_strip
+        else:
             out = self.dut.send_expect("cat drivers/net/i40e/i40e_ethdev.c", "]# ", 10)
             pattern = "#define %s\s*(\d*)" % Q_strip
         s = re.compile(pattern)
@@ -142,7 +142,6 @@ class TestDdpGtp(TestCase):
             self.vm0_testpmd = PmdOutput(self.vm0_dut)
             self.env_done = True
 
-
     def destroy_vm_env(self):
 
         if getattr(self, 'vm0', None):
@@ -185,8 +184,6 @@ class TestDdpGtp(TestCase):
         self.dut_testpmd.execute_cmd('start')
         time.sleep(2)
 
-
-
     def gtp_packets(
             self, type='fdir', tunnel_pkt='gtpu', inner_L3='ipv4',
             match_opt='matched', chk='', teid=0xF):
-- 
2.25.1


^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [dts] [PATCH V1 00/10] Modify suites to support meson
  2020-09-16 12:29 [dts] [PATCH V1 00/10] Modify suites to support meson Zhou, Jun
                   ` (9 preceding siblings ...)
  2020-09-16 12:29 ` [dts] [PATCH 10/10] tests/TestSuite_ddp_gtp.py: adapt " Zhou, Jun
@ 2020-09-17  2:19 ` Zhou, JunX W
  2020-09-23  8:43 ` Tu, Lijuan
  11 siblings, 0 replies; 14+ messages in thread
From: Zhou, JunX W @ 2020-09-17  2:19 UTC (permalink / raw)
  To: dts

[-- Attachment #1: Type: text/plain, Size: 302 bytes --]

Tested-by: Zhou, Jun  <junx.w.zhou@intel.com>

-----Original Message-----
From: Zhou, JunX W 
Sent: Wednesday, September 16, 2020 8:30 PM
To: dts@dpdk.org
Cc: Zhou, JunX W <junx.w.zhou@intel.com>
Subject: [dts][PATCH V1 00/10] Modify suites to support meson

Modify suites to support meson


[-- Attachment #2: TestDdpGtp.log --]
[-- Type: application/octet-stream, Size: 1146359 bytes --]

[-- Attachment #3: TestDdpGtpQregion.log --]
[-- Type: application/octet-stream, Size: 728429 bytes --]

[-- Attachment #4: TestDdpL2tpv3.log --]
[-- Type: application/octet-stream, Size: 541237 bytes --]

[-- Attachment #5: TestDdpPppL2tp.log --]
[-- Type: application/octet-stream, Size: 608699 bytes --]

[-- Attachment #6: TestDynamicConfig.log --]
[-- Type: application/octet-stream, Size: 80290 bytes --]

[-- Attachment #7: TestDynamicQueue.log --]
[-- Type: application/octet-stream, Size: 514048 bytes --]

[-- Attachment #8: TestIpReassembly.log --]
[-- Type: application/octet-stream, Size: 853193 bytes --]

[-- Attachment #9: TestQinqFilter.log --]
[-- Type: application/octet-stream, Size: 244399 bytes --]

[-- Attachment #10: TestQueueStartStop.log --]
[-- Type: application/octet-stream, Size: 225894 bytes --]

[-- Attachment #11: TestRxtxCallbacks.log --]
[-- Type: application/octet-stream, Size: 29721 bytes --]

^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [dts] [PATCH V1 06/10] tests/TestSuite_ipv4_reassembly.py: change mode of set parameter to adapt meson build
  2020-09-16 12:29 ` [dts] [PATCH V1 06/10] tests/TestSuite_ipv4_reassembly.py: change mode of set parameter to adapt meson build Zhou, Jun
@ 2020-09-17  8:40   ` Ma, LihongX
  0 siblings, 0 replies; 14+ messages in thread
From: Ma, LihongX @ 2020-09-17  8:40 UTC (permalink / raw)
  To: Zhou, JunX W, dts; +Cc: Zhou, JunX W, Zhou

Hi, jun
Before 08 release, we can not remove the sed command that change the common_base file, if remove them, the case of makefile will config failed.


> -        self.dut.send_expect(
> -            "sed -i -e
> 's/CONFIG_RTE_LIBRTE_IP_FRAG_MAX_FRAG=.*$/CONFIG_RTE_LIBRTE_IP_FRAG_MAX_FRA
> G=%s/' ./config/common_base" % int(num_of_fragments), "# ")
> +        self.dut.set_build_options({'RTE_LIBRTE_IP_FRAG_MAX_FRAG':
> + int(num_of_fragments)})
>          self.dut.send_expect("export RTE_TARGET=" + self.target, "#")
>          self.dut.send_expect("export RTE_SDK=`pwd`", "#")


^ permalink raw reply	[flat|nested] 14+ messages in thread

* Re: [dts] [PATCH V1 00/10] Modify suites to support meson
  2020-09-16 12:29 [dts] [PATCH V1 00/10] Modify suites to support meson Zhou, Jun
                   ` (10 preceding siblings ...)
  2020-09-17  2:19 ` [dts] [PATCH V1 00/10] Modify suites to support meson Zhou, JunX W
@ 2020-09-23  8:43 ` Tu, Lijuan
  11 siblings, 0 replies; 14+ messages in thread
From: Tu, Lijuan @ 2020-09-23  8:43 UTC (permalink / raw)
  To: Zhou, JunX W, dts; +Cc: Zhou, JunX W

Applied, thanks

> -----Original Message-----
> From: dts <dts-bounces@dpdk.org> On Behalf Of Zhou, Jun
> Sent: 2020^[$BG/^[(B9^[$B7n^[(B16^[$BF|^[(B 20:30
> To: dts@dpdk.org
> Cc: Zhou, JunX W <junx.w.zhou@intel.com>
> Subject: [dts] [PATCH V1 00/10] Modify suites to support meson
> 
> Modify suites to support meson
> 
> *** BLURB HERE ***
> 
> Zhou, Jun (10):
>   tests/TestSuite_ddp_gtp_qregion.py: Instead of getting the rxq&txq
>     value from common_base to rte_config.h
>   tests/TestSuite_ddp_l2tpv3.py: Instead of getting the rxq&txq value
>     from common_base to rte_config.h
>   tests/TestSuite_ddp_ppp_l2tp.py: Instead of getting the rxq&txq value
>     from common_base to rte_config.h
>   tests/TestSuite_dynamic_flowtype.py: Instead of getting the rxq&txq
>     value from common_base to rte_config.h
>   tests/TestSuite_dynamic_queue.py: Instead of getting the rxq&txq value
>     from common_base to rte_config.h
>   tests/TestSuite_ipv4_reassembly.py: change mode of set parameter to
>     adapt meson build
>   tests/TestSuite_qinq_filter.py: change mode of set parameter to adapt
>     meson build
>   tests/TestSuite_queue_start_stop.py:adapt to support both meson and
>     makefile build
>   tests/tests/TestSuite_rxtx_callbacks.py:adapt to support both meson
>     and makefile build
>   tests/TestSuite_ddp_gtp.py: adapt to support both meson and makefile
>     build
> 
>  tests/TestSuite_ddp_gtp.py          | 13 +++++--------
>  tests/TestSuite_ddp_gtp_qregion.py  |  6 +++---
>  tests/TestSuite_ddp_l2tpv3.py       |  7 +++----
>  tests/TestSuite_ddp_ppp_l2tp.py     |  6 +++---
>  tests/TestSuite_dynamic_flowtype.py |  6 +++---
>  tests/TestSuite_dynamic_queue.py    | 12 ++++++------
>  tests/TestSuite_ipv4_reassembly.py  |  7 +++----
>  tests/TestSuite_qinq_filter.py      |  7 ++-----
>  tests/TestSuite_queue_start_stop.py |  5 +++--
>  tests/TestSuite_rxtx_callbacks.py   |  4 ++--
>  10 files changed, 33 insertions(+), 40 deletions(-)
> 
> --
> 2.25.1


^ permalink raw reply	[flat|nested] 14+ messages in thread

end of thread, back to index

Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-16 12:29 [dts] [PATCH V1 00/10] Modify suites to support meson Zhou, Jun
2020-09-16 12:29 ` [dts] [PATCH V1 01/10] tests/TestSuite_ddp_gtp_qregion.py: Instead of getting the rxq&txq value from common_base to rte_config.h Zhou, Jun
2020-09-16 12:29 ` [dts] [PATCH V1 02/10] tests/TestSuite_ddp_l2tpv3.py: " Zhou, Jun
2020-09-16 12:29 ` [dts] [PATCH V1 03/10] tests/TestSuite_ddp_ppp_l2tp.py: " Zhou, Jun
2020-09-16 12:29 ` [dts] [PATCH V1 04/10] tests/TestSuite_dynamic_flowtype.py: " Zhou, Jun
2020-09-16 12:29 ` [dts] [PATCH V1 05/10] tests/TestSuite_dynamic_queue.py: " Zhou, Jun
2020-09-16 12:29 ` [dts] [PATCH V1 06/10] tests/TestSuite_ipv4_reassembly.py: change mode of set parameter to adapt meson build Zhou, Jun
2020-09-17  8:40   ` Ma, LihongX
2020-09-16 12:29 ` [dts] [PATCH V1 07/10] tests/TestSuite_qinq_filter.py: " Zhou, Jun
2020-09-16 12:29 ` [dts] [PATCH V1 08/10] tests/TestSuite_queue_start_stop.py:adapt to support both meson and makefile build Zhou, Jun
2020-09-16 12:29 ` [dts] [PATCH V1 09/10] tests/tests/TestSuite_rxtx_callbacks.py:adapt " Zhou, Jun
2020-09-16 12:29 ` [dts] [PATCH 10/10] tests/TestSuite_ddp_gtp.py: adapt " Zhou, Jun
2020-09-17  2:19 ` [dts] [PATCH V1 00/10] Modify suites to support meson Zhou, JunX W
2020-09-23  8:43 ` Tu, Lijuan

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