Add support for output the standard deviation

Add the prefix for all the tests
And output the standard deviation and standard error for each test item
Except the GFCBench3, all other tests have been verified on LAVA.

Change-Id: I54dc04cdbf3ed9e36e996264d56a3634e722a0b1
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>

1 files changed, 18 insertions, 10 deletions

diff --git a/antutu3/vc.py b/antutu3/vc.py
index ea8115e..156498a 100755
--- a/antutu3/vc.py
+++ b/antutu3/vc.py
@@ -6,6 +6,11 @@ from subprocess import call
 
 from com.dtmilano.android.viewclient import ViewClient, ViewNotFoundException
 
+parent_dir = os.path.realpath(os.path.dirname(__file__))
+f_output_result="%s/../common/output-test-result.sh"  % parent_dir
+
+default_unit = 'points'
+
 kwargs1 = {'verbose': False, 'ignoresecuredevice': False}
 device, serialno = ViewClient.connectToDeviceOrExit(**kwargs1)
 kwargs2 = {'startviewserver': True, 'forceviewserveruse': False, 'autodump': False, 'ignoreuiautomatorkilled': True, 'compresseddump': False}
@@ -25,6 +30,10 @@ def dump_always():
             time.sleep(5)
 
 
+def output_result(test_name, measurement):
+    call([f_output_result, "antutu332_" + test_name, 'pass',  measurement, default_unit])
+
+
 # release info and upgrade dialog are not presented
 # if there is no connection to Internet
 try:
@@ -92,18 +101,17 @@ threed_score = vc.findViewByIdOrRaise("com.antutu.ABenchMark:id/text_3d")
 db_score = vc.findViewByIdOrRaise("com.antutu.ABenchMark:id/text_db")
 sd_write_score = vc.findViewByIdOrRaise("com.antutu.ABenchMark:id/text_sdw")
 sd_read_score = vc.findViewByIdOrRaise("com.antutu.ABenchMark:id/text_sdr")
-default_unit = 'points'
 
-call(['lava-test-case', '"AnTuTu 3.3.2 CPU Integer Score"', '--result', 'pass', '--measurement', cpu_int_score.getText(), '--units', default_unit])
-call(['lava-test-case', '"AnTuTu 3.3.2 CPU Float Score"', '--result', 'pass', '--measurement', cpu_float_score.getText(), '--units', default_unit])
-call(['lava-test-case', '"AnTuTu 3.3.2 2D Score"', '--result', 'pass', '--measurement', twod_score.getText().split(" ")[1], '--units', default_unit])
-call(['lava-test-case', '"AnTuTu 3.3.2 3D Score"', '--result', 'pass', '--measurement', threed_score.getText().split(" ")[1], '--units', default_unit])
-call(['lava-test-case', '"AnTuTu 3.3.2 Mem Score"', '--result', 'pass', '--measurement', mem_score.getText(), '--units', default_unit])
-call(['lava-test-case', '"AnTuTu 3.3.2 DB Score"', '--result', 'pass', '--measurement', db_score.getText(), '--units', default_unit])
-call(['lava-test-case', '"AnTuTu 3.3.2 SD Write Score"', '--result', 'pass', '--measurement', sd_write_score.getText(), '--units', default_unit])
-call(['lava-test-case', '"AnTuTu 3.3.2 SD Read Score"', '--result', 'pass', '--measurement', sd_read_score.getText(), '--units', default_unit])
+output_result("CPU_Integer_Score", cpu_int_score.getText())
+output_result("CPU_Float_Score", cpu_float_score.getText())
+output_result("2D_Score", twod_score.getText().strip().split(" ")[1])
+output_result("3D_Score", threed_score.getText().strip().split(" ")[1])
+output_result("Mem_Score", mem_score.getText())
+output_result("DB_Score", db_score.getText())
+output_result("SD_Write_Score", sd_write_score.getText().strip().split(' ').pop())
+output_result("SD_Read_Score", sd_read_score.getText().strip().split(' ').pop())
 
 total_score = int(cpu_int_score.getText().strip()) + int(cpu_float_score.getText().strip()) + int(twod_score.getText().strip().split(" ")[1])
 total_score = total_score + int(threed_score.getText().strip().split(" ")[1]) + int(mem_score.getText().strip()) + int(db_score.getText().strip())
 total_score = total_score + int(sd_write_score.getText().strip().split(' ').pop()) + int(sd_read_score.getText().strip().split(' ').pop())
-call(['lava-test-case', '"AnTuTu 3.3.2 Total Score"', '--result', 'pass', '--measurement', str(total_score), '--units', default_unit])
+output_result("total_score", str(total_score))