diff mbox series

[V1] DTS modify verify value to adapt dpdk's echo changes

Message ID 20201102082211.13792-1-junx.w.zhou@intel.com (mailing list archive)
State Accepted
Headers show
Series [V1] DTS modify verify value to adapt dpdk's echo changes | expand

Commit Message

Zhou, JunX W Nov. 2, 2020, 8:22 a.m. UTC
DTS modify verify value to adapt dpdk's echo changes

Signed-off-by: Zhou, Jun <junx.w.zhou@intel.com>
---
 tests/TestSuite_coremask.py        | 4 ++--
 tests/TestSuite_l3fwdacl.py        | 6 +++---
 tests/TestSuite_unit_tests_dump.py | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

Comments

Zhou, JunX W Nov. 2, 2020, 8:22 a.m. UTC | #1
Tested-by: Zhou, Jun <junx.w.zhou@intel.com>

-----Original Message-----
From: Zhou, Jun [mailto:junx.w.zhou@intel.com] 
Sent: Monday, November 2, 2020 4:22 PM
To: dts@dpdk.org
Cc: Zhou, JunX W <junx.w.zhou@intel.com>; Zhou
Subject: [dts][PATCH V1] DTS modify verify value to adapt dpdk's echo changes
Lijuan Tu Nov. 3, 2020, 4:29 a.m. UTC | #2
> DTS modify verify value to adapt dpdk's echo changes
> 
> Signed-off-by: Zhou, Jun <junx.w.zhou@intel.com>

Applied
diff mbox series

Patch

diff --git a/tests/TestSuite_coremask.py b/tests/TestSuite_coremask.py
index 73341bdf..43c68e9d 100644
--- a/tests/TestSuite_coremask.py
+++ b/tests/TestSuite_coremask.py
@@ -107,7 +107,7 @@  class TestCoremask(TestCase):
             self.verify("EAL: Detected lcore %s as core" % core in out,
                         "Core %s not detected" % core)
 
-            self.verify("EAL: Master lcore %s is ready" % core in out,
+            self.verify("EAL: Main lcore %s is ready" % core in out,
                         "Core %s not ready" % core)
 
             self.dut.send_expect("quit", "# ", 10)
@@ -126,7 +126,7 @@  class TestCoremask(TestCase):
         command = command_line % (self.app_test_path, core_mask, self.mem_channel)
 
         out = self.dut.send_expect(command, "RTE>>", 10)
-        self.verify("EAL: Master lcore %s is ready" % first_core in out,
+        self.verify("EAL: Main lcore %s is ready" % first_core in out,
                     "Core %s not ready" % first_core )
 
         self.verify("EAL: Detected lcore %s as core" % first_core in out,
diff --git a/tests/TestSuite_l3fwdacl.py b/tests/TestSuite_l3fwdacl.py
index 35b7c25b..cc87e172 100644
--- a/tests/TestSuite_l3fwdacl.py
+++ b/tests/TestSuite_l3fwdacl.py
@@ -170,7 +170,7 @@  class TestL3fwdacl(TestCase):
         extra_args = ''
 
         if scalar:
-            extra_args = '--scalar'
+            extra_args = '--alg="scalar"'
 
         cmdline = '%s -c %s -n %d -- -p %s --config="(%d,0,2),(%d,0,3)" --rule_ipv4="%s" --rule_ipv6="%s" %s' % \
                   (self.app_l3fwd_acl_path, self.core_mask, self.dut.get_memory_channels(),
@@ -840,7 +840,7 @@  class TestL3fwdacl(TestCase):
         rule_list_ipv4.append(TestL3fwdacl.invalid_port_rule_ipv4)
         self.create_acl_ipv4_db(rule_list_ipv4)
 
-        cmdline = '%s -c %s -n %d -- -p %s --config="(%d,0,2),(%d,0,3)" --rule_ipv4="%s" --rule_ipv6="%s" --scalar' % \
+        cmdline = '%s -c %s -n %d -- -p %s --config="(%d,0,2),(%d,0,3)" --rule_ipv4="%s" --rule_ipv6="%s" --alg="scalar"' % \
                   (self.app_l3fwd_acl_path, self.core_mask, self.dut.get_memory_channels(),
                    self.port_mask, self.dut_ports[0], self.dut_ports[1],
                    TestL3fwdacl.acl_ipv4_db, TestL3fwdacl.acl_ipv6_db)
@@ -852,7 +852,7 @@  class TestL3fwdacl(TestCase):
         rule_list_ipv6.append(TestL3fwdacl.invalid_port_rule_ipv6)
         self.create_acl_ipv6_db(rule_list_ipv6)
 
-        cmdline = '%s -c %s -n %d -- -p %s --config="(%d,0,2),(%d,0,3)" --rule_ipv4="%s" --rule_ipv6="%s" --scalar' % \
+        cmdline = '%s -c %s -n %d -- -p %s --config="(%d,0,2),(%d,0,3)" --rule_ipv4="%s" --rule_ipv6="%s" --alg="scalar"' % \
                   (self.app_l3fwd_acl_path, self.core_mask, self.dut.get_memory_channels(),
                    self.port_mask, self.dut_ports[0], self.dut_ports[1],
                    TestL3fwdacl.acl_ipv4_db, TestL3fwdacl.acl_ipv6_db)
diff --git a/tests/TestSuite_unit_tests_dump.py b/tests/TestSuite_unit_tests_dump.py
index 603cc1a3..336cce21 100644
--- a/tests/TestSuite_unit_tests_dump.py
+++ b/tests/TestSuite_unit_tests_dump.py
@@ -102,7 +102,7 @@  class TestUnitTestsDump(TestCase):
         
         # Nic driver will create multiple rings.
         # Only check the last one to make sure ring_dump function work.
-        self.verify( 'MP_mbuf_pool_socket_0' in results, "dump ring name failed")
+        self.verify( 'MP_mb_pool_0' in results, "dump ring name failed")
         for result in results:
             self.dut.send_expect("%s" % cmd, "testpmd>", self.start_test_time)
             out = self.dut.send_expect("dump_ring %s" % result, "testpmd>", self.run_cmd_time)
@@ -123,7 +123,7 @@  class TestUnitTestsDump(TestCase):
         m = re.compile(r"%s" % match_regex, re.S)
         results = m.findall(out)
 
-        self.verify(results[0][0] == 'mbuf_pool_socket_0', "dump mempool name failed")
+        self.verify(results[0][0] == 'mb_pool_0', "dump mempool name failed")
         for result in results:
             self.dut.send_expect("%s" % cmd, "testpmd>", self.start_test_time)
             out = self.dut.send_expect("dump_mempool %s" % result[0], "testpmd>", self.run_cmd_time * 2)