[dts] [PATCH V1 02/14] tests/unit_tests_dump:addcreate_eal_parameters function

[huang,zhimin]

Signed-off-by: huang,zhimin <zhiminx.huang at intel.com>
---
 tests/TestSuite_unit_tests_dump.py | 39 +++++++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/tests/TestSuite_unit_tests_dump.py b/tests/TestSuite_unit_tests_dump.py
index 7772223..57dfc3a 100644
--- a/tests/TestSuite_unit_tests_dump.py
+++ b/tests/TestSuite_unit_tests_dump.py
@@ -55,14 +55,14 @@ class TestUnitTestsDump(TestCase):
     # Test cases.
     #
 
+
     def set_up_all(self):
         """
         Run at the start of each test suite.
         Nothing to do here.
         """
         # Based on h/w type, choose how many ports to use
-        cores = self.dut.get_core_list("all")
-        self.coremask = utils.create_mask(cores)
+        self.cores = self.dut.get_core_list("all")
         self.dut_ports = self.dut.get_ports(self.nic)
         self.verify(len(self.dut_ports) >= 1, "Insufficient ports for testing")
         self.start_test_time = 60
@@ -79,7 +79,8 @@ class TestUnitTestsDump(TestCase):
         """
         Run history log dump test case.
         """
-        self.dut.send_expect("./%s/app/test -n 1 -c %s" % (self.target, self.coremask), "R.*T.*E.*>.*>", self.start_test_time)
+        eal_params = self.dut.create_eal_parameters(cores=self.cores)
+        self.dut.send_expect("./%s/app/test %s" % (self.target, eal_params), "R.*T.*E.*>.*>", self.start_test_time)
         out = self.dut.send_expect("dump_log_history", "RTE>>", self.run_cmd_time * 2)
         self.dut.send_expect("quit", "# ")
         self.verify("EAL" in out, "Test failed")
@@ -88,7 +89,8 @@ class TestUnitTestsDump(TestCase):
         """
         Run history log dump test case.
         """
-        cmd = "./%s/app/testpmd -n 1 -c f -- -i" % self.target
+        eal_params = self.dut.create_eal_parameters(cores='1S/4C/1T')
+        cmd = "./%s/app/testpmd %s  -- -i" % (self.target,eal_params)
 
         self.dut.send_expect("%s" % cmd, "testpmd>", self.start_test_time)
         out = self.dut.send_expect("dump_ring", "testpmd>", self.run_cmd_time)
@@ -110,7 +112,8 @@ class TestUnitTestsDump(TestCase):
         """
         Run mempool dump test case.
         """
-        cmd = "./%s/app/testpmd -n 1 -c f -- -i" % self.target
+        eal_params = self.dut.create_eal_parameters(cores='1S/4C/1T')
+        cmd = "./%s/app/testpmd %s  -- -i" % (self.target,eal_params)
 
         self.dut.send_expect("%s" % cmd, "testpmd>", self.start_test_time)
         out = self.dut.send_expect("dump_mempool", "testpmd>", self.run_cmd_time * 2)
@@ -131,7 +134,8 @@ class TestUnitTestsDump(TestCase):
         """
         Run physical memory dump test case.
         """
-        self.dut.send_expect("./%s/app/test -n 1 -c %s" % (self.target, self.coremask), "R.*T.*E.*>.*>", self.start_test_time)
+        eal_params = self.dut.create_eal_parameters(cores=self.cores)
+        self.dut.send_expect("./%s/app/test %s" % (self.target,eal_params), "R.*T.*E.*>.*>", self.start_test_time)
         out = self.dut.send_expect("dump_physmem", "RTE>>", self.run_cmd_time * 2)
         self.dut.send_expect("quit", "# ")
         elements = ['Segment', 'IOVA', 'len', 'virt', 'socket_id', 'hugepage_sz', 'nchannel', 'nrank']
@@ -151,7 +155,8 @@ class TestUnitTestsDump(TestCase):
         """
         Run memzone dump test case.
         """
-        cmd = "./%s/app/testpmd -n 1 -c f -- -i" % self.target
+        eal_params = self.dut.create_eal_parameters(cores='1S/4C/1T')
+        cmd = "./%s/app/testpmd %s  -- -i" % (self.target,eal_params)
 
         self.dut.send_expect("%s" % cmd, "testpmd>", self.start_test_time)
         out = self.dut.send_expect("dump_memzone", "testpmd>", self.run_cmd_time * 2)
@@ -174,7 +179,8 @@ class TestUnitTestsDump(TestCase):
         """
         Run struct size dump test case.
         """
-        self.dut.send_expect("./%s/app/test -n 1 -c %s" % (self.target, self.coremask), "R.*T.*E.*>.*>", self.start_test_time)
+        eal_params = self.dut.create_eal_parameters(cores=self.cores)
+        self.dut.send_expect("./%s/app/test %s" % (self.target,eal_params), "R.*T.*E.*>.*>", self.start_test_time)
         out = self.dut.send_expect("dump_struct_sizes", "RTE>>", self.run_cmd_time * 2)
         self.dut.send_expect("quit", "# ")
 
@@ -194,15 +200,15 @@ class TestUnitTestsDump(TestCase):
         """
         test_port = self.dut_ports[0]
         pci_address = self.dut.ports_info[test_port]['pci'];
-        self.dut.send_expect("./%s/app/test -n 1 -c %s -b %s"
-                             % (self.target, self.coremask, pci_address), "R.*T.*E.*>.*>", self.start_test_time)
+        eal_params = self.dut.create_eal_parameters(cores=self.cores,b_ports=[pci_address])
+        self.dut.send_expect("./%s/app/test %s" % (self.target,eal_params), "R.*T.*E.*>.*>", self.start_test_time)
         out = self.dut.send_expect("dump_devargs", "RTE>>", self.run_cmd_time * 2)
         self.dut.send_expect("quit", "# ")
         black_str = " %s" % pci_address
         self.verify(black_str in out, "Dump black list failed")
 
-        self.dut.send_expect("./%s/app/test -n 1 -c %s -w %s"
-                             % (self.target, self.coremask, pci_address), "R.*T.*E.*>.*>", self.start_test_time)
+        eal_params1 = self.dut.create_eal_parameters(cores=self.cores,ports=[pci_address])
+        self.dut.send_expect("./%s/app/test %s" % (self.target,eal_params1), "R.*T.*E.*>.*>", self.start_test_time)
         out = self.dut.send_expect("dump_devargs", "RTE>>", self.run_cmd_time * 2)
         self.dut.send_expect("quit", "# ")
 
@@ -213,7 +219,8 @@ class TestUnitTestsDump(TestCase):
         """
         Run dump malloc dump test case.
         """
-        self.dut.send_expect("./%s/app/test -n 1 -c %s" % (self.target, self.coremask), "R.*T.*E.*>.*>", self.start_test_time)
+        eal_params = self.dut.create_eal_parameters(cores=self.cores)
+        self.dut.send_expect("./%s/app/test %s" % (self.target,eal_params), "R.*T.*E.*>.*>", self.start_test_time)
         out = self.dut.send_expect("dump_malloc_stats", "RTE>>", self.run_cmd_time * 2)
         self.dut.send_expect("quit", "# ")
         match_regex = "Heap id:(\d*)"
@@ -228,7 +235,8 @@ class TestUnitTestsDump(TestCase):
         """
         Run malloc heaps dump test case.
         """
-        self.dut.send_expect("./%s/app/test -n 1 -c %s" % (self.target, self.coremask), "R.*T.*E.*>.*>", self.start_test_time)
+        eal_params = self.dut.create_eal_parameters(cores=self.cores)
+        self.dut.send_expect("./%s/app/test %s" % (self.target,eal_params), "R.*T.*E.*>.*>", self.start_test_time)
         out = self.dut.send_expect("dump_malloc_heaps", "RTE>>", self.run_cmd_time * 2)
         self.dut.send_expect("quit", "# ")
 
@@ -247,7 +255,8 @@ class TestUnitTestsDump(TestCase):
         """
         Run log types dump test case.
         """
-        self.dut.send_expect("./%s/app/test -n 1 -c %s" % (self.target, self.coremask), "R.*T.*E.*>.*>", self.start_test_time)
+        eal_params = self.dut.create_eal_parameters(cores=self.cores)
+        self.dut.send_expect("./%s/app/test %s" % (self.target,eal_params), "R.*T.*E.*>.*>", self.start_test_time)
         out = self.dut.send_expect("dump_log_types", "RTE>>", self.run_cmd_time * 2)
         self.dut.send_expect("quit", "# ")
 
-- 
1.8.3.1