[dts] [PATCH] tests/coremask: fix error when config RTE_MAX_LCORE
Joyce Kong
joyce.kong at arm.com
Fri Jun 1 05:01:28 CEST 2018
Add check for available max lcore according to whether
configure RTE_MAX_LCORE.
Signed-off-by: Joyce Kong <joyce.kong at arm.com>
---
tests/TestSuite_coremask.py | 52 ++++++++++++++++++++++++---------------------
1 file changed, 28 insertions(+), 24 deletions(-)
diff --git a/tests/TestSuite_coremask.py b/tests/TestSuite_coremask.py
index bad97a2..5447d71 100644
--- a/tests/TestSuite_coremask.py
+++ b/tests/TestSuite_coremask.py
@@ -46,12 +46,31 @@ class TestCoremask(TestCase):
"""
pass
+ def get_available_max_lcore(self):
+ """
+ Check available max lcore according to configuration.
+ """
+ available_max_lcore = len(self.all_cores)+1
+
+ out = self.dut.send_expect("cat config/defconfig_%s" % self.target, "]# ", 10)
+ start_position = out.find('CONFIG_RTE_MAX_LCORE=')
+
+ if start_position > -1:
+ if out.find('\n', start_position) > -1:
+ end_position = out.find('\n', start_position)
+ else:
+ end_position = len(out)
+ available_max_lcore = int(out[start_position + 21:end_position])
+
+ return available_max_lcore
+
def test_individual_coremask(self):
"""
Check coremask parsing for all the available cores one by one.
"""
+ max_lcore_configed = self.get_available_max_lcore()
- for core in self.all_cores:
+ for core in self.all_cores[:max_lcore_configed-1]:
core_mask = utils.create_mask([core])
@@ -71,8 +90,8 @@ class TestCoremask(TestCase):
"""
Check coremask parsing for all the cores at once.
"""
-
- core_mask = utils.create_mask(self.all_cores)
+ max_lcore_configed = self.get_available_max_lcore()
+ core_mask = utils.create_mask(self.all_cores[:max_lcore_configed-1])
command = command_line % (self.target, core_mask, self.mem_channel)
@@ -83,7 +102,7 @@ class TestCoremask(TestCase):
self.verify("EAL: Detected lcore 1 as core" in out,
"Core 1 not detected")
- for core in self.all_cores[1:]:
+ for core in self.all_cores[1:max_lcore_configed-1]:
self.verify("EAL: lcore %s is ready" % core in out,
"Core %s not ready" % core)
@@ -99,38 +118,23 @@ class TestCoremask(TestCase):
command_line = """./%s/app/test -c %s -n %d --log-level="lib.eal,8" 2>&1 |tee out"""
- # Default big coremask value 128
- big_coremask_size = 128
-
- try:
- out = self.dut.send_expect("cat config/defconfig_%s" % self.target, "]# ", 10)
- start_position = out.find('CONFIG_RTE_MAX_LCORE=')
-
- if start_position > -1:
- end_position = out.find('\n', start_position)
- big_coremask_size = int(out[start_position + 21:end_position])
-
- print "Detected CONFIG_RTE_MAX_LCORE=%d" % big_coremask_size
- except:
- print "Using default big coremask %d" % big_coremask_size
-
# Create a extremely big coremask
+ big_coremask_size = self.get_available_max_lcore()
big_coremask = "0x"
for _ in range(0, big_coremask_size, 4):
- big_coremask += "F"
+ big_coremask += "f"
command = command_line % (self.target, big_coremask, self.mem_channel)
try:
- self.dut.send_expect(command, "RTE>>", 10)
+ out = self.dut.send_expect(command, "RTE>>", 10)
except:
- out = self.dut.send_expect("cat out", "# ")
self.verify("EAL: invalid coremask" in out,
- "Small core mask set")
+ "Small core mask set")
self.verify("EAL: Detected lcore 0 as core" in out,
"Core 0 not detected")
- for core in self.all_cores[1:]:
+ for core in self.all_cores[1:big_coremask_size-1]:
self.verify("EAL: Detected lcore %s as core" % core in out,
"Core %s not detected" % core)
--
1.8.3.1
More information about the dts
mailing list