antutu series test: add the total score for all versions

the total score is just the sum of all sub scores

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

4 files changed, 23 insertions, 2 deletions

diff --git a/antutu2/vc.py b/antutu2/vc.py
index a203162..d9e1ee6 100755
--- a/antutu2/vc.py
+++ b/antutu2/vc.py
@@ -86,4 +86,9 @@ call(['lava-test-case', '"AnTuTu 2.8.2 3D Score"', '--result', 'pass', '--measur
 call(['lava-test-case', '"AnTuTu 2.8.2 Mem Score"', '--result', 'pass', '--measurement', mem_score.getText(), '--units', default_unit])
 call(['lava-test-case', '"AnTuTu 2.8.2 DB Score"', '--result', 'pass', '--measurement', db_score.getText(), '--units', default_unit])
 call(['lava-test-case', '"AnTuTu 2.8.2 SD Write Score"', '--result', 'pass', '--measurement', sd_write_score.getText(), '--units', default_unit])
-call(['lava-test-case', '"AnTuTu 2.8.2 SD Read Score"', '--result', 'pass', '--measurement', sd_write_score.getText(), '--units', default_unit])
+call(['lava-test-case', '"AnTuTu 2.8.2 SD Read Score"', '--result', 'pass', '--measurement', sd_read_score.getText(), '--units', default_unit])
+
+total_score = int(cpu_int_score.getText().strip()) + int(cpu_float_score.getText().strip()) + int(twod_score.getText().strip())
+total_score = total_score + int(threed_score.getText().strip()) + 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 2.8.2 Total Score"', '--result', 'pass', '--measurement', str(total_score), '--units', default_unit])
diff --git a/antutu3/execute.sh b/antutu3/execute.sh
index d665955..118e48f 100755
--- a/antutu3/execute.sh
+++ b/antutu3/execute.sh
@@ -21,4 +21,5 @@ function change_no_update(){
 parent_dir=`dirname ${0}`
 source "${parent_dir}/../common/common.sh"
 post_install="change_no_update"
+timeout=30m
 main "$@"
diff --git a/antutu3/vc.py b/antutu3/vc.py
index fd4b304..441a1d5 100755
--- a/antutu3/vc.py
+++ b/antutu3/vc.py
@@ -48,6 +48,8 @@ while(not finished):
             finished = True
     except RuntimeError:
         pass
+    except ValueError:
+        pass
 
 print "benchmark finished"
 
@@ -85,4 +87,9 @@ call(['lava-test-case', '"AnTuTu 3.3.2 3D Score"', '--result', 'pass', '--measur
 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_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])
+
+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])
diff --git a/antutu4/vc.py b/antutu4/vc.py
index 82f81c7..9d983ff 100755
--- a/antutu4/vc.py
+++ b/antutu4/vc.py
@@ -83,3 +83,11 @@ call(['lava-test-case', '"AnTuTu 4.0.3 GPU 2D Graphics Score"', '--result', 'pas
 call(['lava-test-case', '"AnTuTu 4.0.3 GPU 3D Graphics Score"', '--result', 'pass', '--measurement', threed_graphics_score.getText().split(" ")[1], '--units', default_unit])
 call(['lava-test-case', '"AnTuTu 4.0.3 IO Storage I/O Score"', '--result', 'pass', '--measurement', storage_io_score.getText(), '--units', default_unit])
 call(['lava-test-case', '"AnTuTu 4.0.3 IO Database I/O Score"', '--result', 'pass', '--measurement', database_io_score.getText(), '--units', default_unit])
+
+total_score = 0
+total_score = total_score + int(multitask_score.getText().strip()) + int(dalvik_score.getText().strip())
+total_score = total_score + int(cpu_integer_score.getText().strip()) + int(cpu_float_point_score.getText().strip())
+total_score = total_score + int(ram_operation_score.getText().strip()) + int(ram_speed_score.getText().strip())
+total_score = total_score + int(twod_graphics_score.getText().strip().split(" ")[1]) + int(threed_graphics_score.getText().strip().split(" ")[1])
+total_score = total_score + int(storage_io_score.getText().strip().split(' ').pop()) + int(database_io_score.getText().strip().split(' ').pop())
+call(['lava-test-case', '"AnTuTu 4.0.3 Total Score"', '--result', 'pass', '--measurement', str(total_score), '--units', default_unit])