From 27a751dc824efcb96fac00a581dc89ad8b5c485c Mon Sep 17 00:00:00 2001 From: Jianbo Liu Date: Mon, 16 Jan 2017 13:29:16 +0800 Subject: tests multiprocess: select lower-numbered cores for secondary process Reduce cores usage to make this case can run successfully on system with fewer cores. Signed-off-by: Jianbo Liu --- tests/TestSuite_multiprocess.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'tests/TestSuite_multiprocess.py') diff --git a/tests/TestSuite_multiprocess.py b/tests/TestSuite_multiprocess.py index b305437..ec06b1d 100644 --- a/tests/TestSuite_multiprocess.py +++ b/tests/TestSuite_multiprocess.py @@ -87,7 +87,7 @@ class TestMultiprocess(TestCase, IxiaPacketGenerator): coremask = utils.create_mask(cores) self.dut.send_expect("./examples/multi_process/simple_mp/simple_mp/%s/simple_mp -n 1 -c %s --proc-type=primary" % (self.target, coremask), "Finished Process Init", 100) time.sleep(20) - coremask = hex(int(coremask, 16) * 0x10000).rstrip("L") + coremask = hex(int(coremask, 16) * 0x100).rstrip("L") self.session_secondary.send_expect("./examples/multi_process/simple_mp/simple_mp/%s/simple_mp -n 1 -c %s --proc-type=secondary" % (self.target, coremask), "Finished Process Init", 100) self.session_secondary.send_expect("send hello_primary", ">") @@ -100,7 +100,7 @@ class TestMultiprocess(TestCase, IxiaPacketGenerator): coremask = utils.create_mask(cores) self.session_secondary.send_expect("./examples/multi_process/simple_mp/simple_mp/%s/simple_mp -n 1 -c %s --proc-type=primary " % (self.target, coremask), "Finished Process Init", 100) time.sleep(20) - coremask = hex(int(coremask, 16) * 0x10000).rstrip("L") + coremask = hex(int(coremask, 16) * 0x100).rstrip("L") self.dut.send_expect("./examples/multi_process/simple_mp/simple_mp/%s/simple_mp -n 1 -c %s --proc-type=secondary" % (self.target, coremask), "Finished Process Init", 100) self.session_secondary.send_expect("send hello_secondary", ">") out = self.dut.get_session_output() @@ -119,7 +119,7 @@ class TestMultiprocess(TestCase, IxiaPacketGenerator): coremask = utils.create_mask(cores) self.session_secondary.send_expect("./examples/multi_process/simple_mp/simple_mp/%s/simple_mp -n 1 -c %s --proc-type=primary" % (self.target, coremask), "Finished Process Init", 100) time.sleep(20) - coremask = hex(int(coremask, 16) * 0x10000).rstrip("L") + coremask = hex(int(coremask, 16) * 0x100).rstrip("L") self.dut.send_expect("./examples/multi_process/simple_mp/simple_mp/%s/simple_mp -n 1 -c %s --proc-type=secondary" % (self.target, coremask), "Finished Process Init", 100) stringsSent = 0 for line in open('/usr/share/dict/words', 'r').readlines(): @@ -144,7 +144,7 @@ class TestMultiprocess(TestCase, IxiaPacketGenerator): out = self.dut.send_expect("./examples/multi_process/simple_mp/simple_mp/%s/simple_mp -n 1 -c %s --proc-type=auto " % (self.target, coremask), "Finished Process Init", 100) self.verify("EAL: Auto-detected process type: PRIMARY" in out, "The type of process (PRIMARY) was not detected properly") time.sleep(20) - coremask = hex(int(coremask, 16) * 0x10000).rstrip("L") + coremask = hex(int(coremask, 16) * 0x100).rstrip("L") out = self.session_secondary.send_expect("./examples/multi_process/simple_mp/simple_mp/%s/simple_mp -n 1 -c %s --proc-type=auto" % (self.target, coremask), "Finished Process Init", 100) self.verify("EAL: Auto-detected process type: SECONDARY" in out, "The type of process (SECONDARY) was not detected properly") @@ -161,7 +161,7 @@ class TestMultiprocess(TestCase, IxiaPacketGenerator): out = self.session_secondary.send_expect("./examples/multi_process/simple_mp/simple_mp/%s/simple_mp -n 1 -c %s --proc-type=auto" % (self.target, coremask), "Finished Process Init", 100) self.verify("EAL: Auto-detected process type: PRIMARY" in out, "The type of process (PRIMARY) was not detected properly") time.sleep(20) - coremask = hex(int(coremask, 16) * 0x10000).rstrip("L") + coremask = hex(int(coremask, 16) * 0x100).rstrip("L") out = self.dut.send_expect("./examples/multi_process/simple_mp/simple_mp/%s/simple_mp -n 1 -c %s --proc-type=auto" % (self.target, coremask), "Finished Process Init", 100) self.verify("EAL: Auto-detected process type: SECONDARY" in out, "The type of process (SECONDARY) was not detected properly") self.session_secondary.send_expect("send hello_secondary", ">",100) @@ -180,7 +180,7 @@ class TestMultiprocess(TestCase, IxiaPacketGenerator): cores = self.dut.get_core_list('1S/2C/1T') coremask = utils.create_mask(cores) self.session_secondary.send_expect("./examples/multi_process/simple_mp/simple_mp/%s/simple_mp -n 1 -c %s -m 64" % (self.target, coremask), "Finished Process Init", 100) - coremask = hex(int(coremask, 16) * 0x10000).rstrip("L") + coremask = hex(int(coremask, 16) * 0x100).rstrip("L") out = self.dut.send_expect("./examples/multi_process/simple_mp/simple_mp/%s/simple_mp -n 1 -c %s" % (self.target, coremask), "# ", 100) self.verify("Is another primary process running" in out, -- cgit v1.2.3