[V1] tests/TestSuite_mutiprocess.py add -w option when tester and dut in same server

Message ID 20200803175052.3368-1-weix.ling@intel.com (mailing list archive)
State Superseded
Headers
Series [V1] tests/TestSuite_mutiprocess.py add -w option when tester and dut in same server |

Commit Message

Ling, WeiX Aug. 3, 2020, 5:50 p.m. UTC
  add -w option when tester and dut in same server and specified mp_server
and mp_client run with different cores

Signed-off-by: lingwei <weix.ling@intel.com>
---
 tests/TestSuite_multiprocess.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
  

Patch

diff --git a/tests/TestSuite_multiprocess.py b/tests/TestSuite_multiprocess.py
index 5a99ee3..218e008 100644
--- a/tests/TestSuite_multiprocess.py
+++ b/tests/TestSuite_multiprocess.py
@@ -312,16 +312,19 @@  class TestMultiprocess(TestCase):
         for execution in validExecutions:
             coreList = self.dut.get_core_list(execution['cores'], socket=self.socket)
 
-            coreMask = utils.create_mask(self.dut.get_core_list('1S/1C/1T'))
+            # get core with socket parameter to specified which core dut used when tester and dut in same server
+            coreMask = utils.create_mask(self.dut.get_core_list('1S/1C/1T', socket=self.socket))
             portMask = utils.create_mask(self.dut_ports)
-            self.dut.send_expect(self.app_mp_server + " -n %d -c %s -- -p %s -n %d" % (
-                self.dut.get_memory_channels(), "0xA0", portMask, execution['nprocs']), "Finished Process Init", 20)
+            # specified mp_server core and add -w option when tester and dut in same server
+            self.dut.send_expect(self.app_mp_server + " -n %d -c %s %s -- -p %s -n %d" % (
+                self.dut.get_memory_channels(), coreMask, self.eal_param, portMask, execution['nprocs']), "Finished Process Init", 20)
             self.dut.send_expect("^Z", "\r\n")
             self.dut.send_expect("bg", "# ")
 
             for n in range(execution['nprocs']):
                 time.sleep(5)
-                coreMask = utils.create_mask([coreList[n]])
+                # use next core as mp_client core, different from mp_server
+                coreMask = utils.create_mask([str(int(coreList[n]) + 1)])
                 self.dut.send_expect(self.app_mp_client + " -n %d -c %s --proc-type=secondary -- -n %d" % (
                     self.dut.get_memory_channels(), coreMask, n), "Finished Process Init")
                 self.dut.send_expect("^Z", "\r\n")