From 2d23ec5631d13710bd219ae4feaca4a8607e9ae2 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Tue, 11 Feb 2014 12:03:26 +0000 Subject: [PATCH] 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 --- app/test/autotest_data.py | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/app/test/autotest_data.py b/app/test/autotest_data.py index 1161a9281c..af6ed5a0aa 100644 --- a/app/test/autotest_data.py +++ b/app/test/autotest_data.py @@ -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" : [ { @@ -444,26 +444,30 @@ non_parallel_test_group_list = [ ] }, { - "Prefix": "ring_perf", + "Prefix": "timer_perf", "Memory" : all_sockets(512), "Tests" : [ { - "Name" : "Ring performance autotest", - "Command" : "ring_perf_autotest", + "Name" : "Timer performance autotest", + "Command" : "timer_perf_autotest", "Func" : default_autotest, "Report" : None, }, ] }, + +# +# Please always make sure that ring_perf is the last test! +# { - "Prefix": "timer_perf", + "Prefix": "ring_perf", "Memory" : all_sockets(512), "Tests" : [ { - "Name" : "Timer performance autotest", - "Command" : "timer_perf_autotest", + "Name" : "Ring performance autotest", + "Command" : "ring_perf_autotest", "Func" : default_autotest, "Report" : None, }, -- 2.20.1