app/test: fixes to python control script

* Change behaviour to spread the memory specified across all sockets
  rather than duplicating the memory for each one. This way the memory
  size specified is the total memory needed by the test.
* Minor reordering of test cases, to ensure that ring autotest is the
  final test run.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
This commit is contained in:
Bruce Richardson 2014-02-11 12:03:26 +00:00 committed by David Marchand
parent 5c64c7d168
commit 2d23ec5631

View File

@ -43,8 +43,8 @@ def num_sockets():
return 1
return result
# multiply given number for all sockets
# e.g. 32 becomes 32,32 or 32,32,32,32 etc.
# spread given number for all sockets
# e.g. 32 becomes 16,16 or 8,8,8,8 etc.
def all_sockets(num):
mem_per_socket = num / num_sockets()
return ",".join([str(mem_per_socket)] * num_sockets())
@ -165,7 +165,7 @@ parallel_test_group_list = [
},
{
"Prefix": "group_3",
"Memory" : all_sockets(256),
"Memory" : all_sockets(1024),
"Tests" :
[
{
@ -443,19 +443,6 @@ non_parallel_test_group_list = [
},
]
},
{
"Prefix": "ring_perf",
"Memory" : all_sockets(512),
"Tests" :
[
{
"Name" : "Ring performance autotest",
"Command" : "ring_perf_autotest",
"Func" : default_autotest,
"Report" : None,
},
]
},
{
"Prefix": "timer_perf",
"Memory" : all_sockets(512),
@ -469,4 +456,21 @@ non_parallel_test_group_list = [
},
]
},
#
# Please always make sure that ring_perf is the last test!
#
{
"Prefix": "ring_perf",
"Memory" : all_sockets(512),
"Tests" :
[
{
"Name" : "Ring performance autotest",
"Command" : "ring_perf_autotest",
"Func" : default_autotest,
"Report" : None,
},
]
},
]