fixes after running on vexpress-tc2

Signed-off-by: Milosz Wasilewski <milosz.wasilewski@linaro.org>

6 files changed, 76 insertions, 42 deletions

diff --git a/andebench/vc.py b/andebench/vc.py
index ec6f88c..417956c 100644
--- a/andebench/vc.py
+++ b/andebench/vc.py
@@ -57,4 +57,4 @@ results_text = results.getText()
 result_re = re.compile("^(?P<test_case_id>[a-zA-Z\s]+):\s(?P<measurement>\d+)", re.MULTILINE)
 search_results = result_re.finditer(results_text)
 for result in search_results:
-    call(['lava-test-case', result.group('test_case_id'), '--result pass', '--measurement', result.group('measurement'), '--units Iterations/sec'])
+    call(['lava-test-case', result.group('test_case_id'), '--result', 'pass', '--measurement', result.group('measurement'), '--units', 'Iterations/sec'])
diff --git a/antutu/vc.py b/antutu/vc.py
index 207e050..ac10c96 100644
--- a/antutu/vc.py
+++ b/antutu/vc.py
@@ -6,23 +6,28 @@ from subprocess import call
 
 from com.dtmilano.android.viewclient import ViewClient, ViewNotFoundException
 
-kwargs1 = {'verbose': False, 'ignoresecuredevice': False}
+kwargs1 = {'verbose': False, 'ignoresecuredevice': False, 'serialno': '192.168.1.128:5555'}
 device, serialno = ViewClient.connectToDeviceOrExit(**kwargs1)
 kwargs2 = {'startviewserver': True, 'forceviewserveruse': False, 'autodump': False, 'ignoreuiautomatorkilled': True}
 vc = ViewClient(device, serialno, **kwargs2)
+time.sleep(5)
 vc.dump(window='-1')
 
-time.sleep(5)
+# release info and upgrade dialog are not presented
+# if there is no connection to Internet
 try:
     button_cancel = vc.findViewByIdOrRaise("android:id/button2")
     button_cancel.touch()
 except ViewNotFoundException:
     pass
 
-vc.dump(window='-1')
-time.sleep(2)
-button_ok = vc.findViewByIdOrRaise("com.antutu.ABenchMark:id/button_ok")
-button_ok.touch()
+try:
+    vc.dump(window='-1')
+    time.sleep(2)
+    button_ok = vc.findViewByIdOrRaise("com.antutu.ABenchMark:id/button_ok")
+    button_ok.touch()
+except ViewNotFoundException:
+    pass
 
 time.sleep(2)
 vc.dump(window='-1')
@@ -39,20 +44,45 @@ while(not finished):
     time.sleep(1)
     vc.dump(window='-1')
     try:
-        vc.findViewByIdOrRaise("com.antutu.ABenchMark:id/scoreTotal")
+        vc.findViewByIdOrRaise("com.antutu.ABenchMark:id/layoutScoresHeader")
         finished = True
     except ViewNotFoundException:
         pass
 print "benchmark finished"
 
-total_score = vc.findViewByIdOrRaise("com.antutu.ABenchMark:id/scoreTotal")
-cpu_score = vc.findViewByIdOrRaise("com.antutu.ABenchMark:id/scoreCPU")
-gpu_score = vc.findViewByIdOrRaise("com.antutu.ABenchMark:id/scoreGPU")
-mem_score = vc.findViewByIdOrRaise("com.antutu.ABenchMark:id/scoreMem")
-io_score = vc.findViewByIdOrRaise("com.antutu.ABenchMark:id/scoreIO")
-
-call(['lava-test-case', '"AnTuTu 2.8.2 Total Score"', '--result pass', '--measurement', total_score.getText()])
-call(['lava-test-case', '"AnTuTu 2.8.2 CPU Score"', '--result pass', '--measurement', cpu_score.getText()])
-call(['lava-test-case', '"AnTuTu 2.8.2 GPU Score"', '--result pass', '--measurement', gpu_score.getText()])
-call(['lava-test-case', '"AnTuTu 2.8.2 Mem Score"', '--result pass', '--measurement', mem_score.getText()])
-call(['lava-test-case', '"AnTuTu 2.8.2 I/O Score"', '--result pass', '--measurement', io_score.getText()])
+time.sleep(2)
+vc.dump(window='-1')
+header = vc.findViewByIdOrRaise("com.antutu.ABenchMark:id/layoutScoresHeader")
+try:
+    vc.findViewByIdOrRaise("com.antutu.ABenchMark:id/layoutScores")
+except ViewNotFoundException:
+    header.touch()
+
+time.sleep(2)
+vc.dump(window='-1')
+mem_score = vc.findViewByIdOrRaise("com.antutu.ABenchMark:id/text_mem")
+cpu_int_score = vc.findViewByIdOrRaise("com.antutu.ABenchMark:id/text_int")
+cpu_float_score = vc.findViewByIdOrRaise("com.antutu.ABenchMark:id/text_float")
+twod_score = vc.findViewByIdOrRaise("com.antutu.ABenchMark:id/text_2d")
+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")
+
+#call(['lava-test-case', '"AnTuTu 2.8.2 CPU Integer Score"', '--result pass', '--measurement', cpu_int_score.getText()])
+#call(['lava-test-case', '"AnTuTu 2.8.2 CPU Float Score"', '--result pass', '--measurement', cpu_float_score.getText()])
+#call(['lava-test-case', '"AnTuTu 2.8.2 2D Score"', '--result pass', '--measurement', twod_score.getText()])
+#call(['lava-test-case', '"AnTuTu 2.8.2 3D Score"', '--result pass', '--measurement', threed_score.getText()])
+#call(['lava-test-case', '"AnTuTu 2.8.2 Mem Score"', '--result pass', '--measurement', mem_score.getText()])
+#call(['lava-test-case', '"AnTuTu 2.8.2 DB Score"', '--result pass', '--measurement', db_score.getText()])
+#call(['lava-test-case', '"AnTuTu 2.8.2 SD Write Score"', '--result pass', '--measurement', sd_write_score.getText()])
+#call(['lava-test-case', '"AnTuTu 2.8.2 SD Read Score"', '--result pass', '--measurement', sd_write_score.getText()])
+#
+print ['lava-test-case', '"AnTuTu 2.8.2 CPU Integer Score"', '--result pass', '--measurement', cpu_int_score.getText()]
+print ['lava-test-case', '"AnTuTu 2.8.2 CPU Float Score"', '--result pass', '--measurement', cpu_float_score.getText()]
+print ['lava-test-case', '"AnTuTu 2.8.2 2D Score"', '--result pass', '--measurement', twod_score.getText()]
+print ['lava-test-case', '"AnTuTu 2.8.2 3D Score"', '--result pass', '--measurement', threed_score.getText()]
+print ['lava-test-case', '"AnTuTu 2.8.2 Mem Score"', '--result pass', '--measurement', mem_score.getText()]
+print ['lava-test-case', '"AnTuTu 2.8.2 DB Score"', '--result pass', '--measurement', db_score.getText()]
+print ['lava-test-case', '"AnTuTu 2.8.2 SD Write Score"', '--result pass', '--measurement', sd_write_score.getText()]
+print ['lava-test-case', '"AnTuTu 2.8.2 SD Read Score"', '--result pass', '--measurement', sd_write_score.getText()]
diff --git a/caffeinemark/vc.py b/caffeinemark/vc.py
index 754aef8..bf53f3d 100644
--- a/caffeinemark/vc.py
+++ b/caffeinemark/vc.py
@@ -7,8 +7,7 @@ from subprocess import call
 from com.dtmilano.android.viewclient import ViewClient, ViewNotFoundException
 
 def collect_score(score_name, score_widget):
-    #call(['lava-test-case', score_name, '--result pass', '--measurement', score_widget.getText()])
-    print ['lava-test-case', score_name, '--result pass', '--measurement', score_widget.getText()]
+    call(['lava-test-case', score_name, '--result', 'pass', '--measurement', score_widget.getText()])
 
 kwargs1 = {'verbose': False, 'ignoresecuredevice': False}
 device, serialno = ViewClient.connectToDeviceOrExit(**kwargs1)
@@ -23,12 +22,14 @@ start_button.touch()
 finished = False
 while (not finished):
     time.sleep(1)
-    vc.dump(window='-1')
     try:
+        vc.dump(window='-1')
         vc.findViewByIdOrRaise("com.flexycore.caffeinemark:id/testResultsCellOneTitle")
         finished = True
     except ViewNotFoundException:
         pass
+    except RuntimeError as e:
+        print e
 print "benchmark finished"
 
 total_score = vc.findViewByIdOrRaise("com.flexycore.caffeinemark:id/testResultEntryOverAllScore")
diff --git a/geekbench/vc.py b/geekbench/vc.py
index 0fa0d98..ae8f5c6 100644
--- a/geekbench/vc.py
+++ b/geekbench/vc.py
@@ -6,6 +6,13 @@ from subprocess import call
 
 from com.dtmilano.android.viewclient import ViewClient, ViewNotFoundException
 
+def get_score_with_content_desc(vc, content_desc, offset=1):
+    score_view = vc.findViewWithContentDescriptionOrRaise(content_desc)
+    score_uid = score_view.getUniqueId()
+    uid = int(re.search("id/no_id/(?P<uid>\d+)", score_uid).group('uid'))
+    score = vc.findViewByIdOrRaise("id/no_id/%s" % (uid + offset))
+    call(['lava-test-case', content_desc, '--result', 'pass', '--measurement', score.getContentDescription()])
+
 kwargs1 = {'verbose': False, 'ignoresecuredevice': False}
 device, serialno = ViewClient.connectToDeviceOrExit(**kwargs1)
 kwargs2 = {'startviewserver': True, 'forceviewserveruse': False, 'autodump': False, 'ignoreuiautomatorkilled': True}
@@ -20,12 +27,14 @@ time.sleep(2)
 finished = False
 while (not finished):
     time.sleep(1)
-    vc.dump(window='-1')
     try:
+        vc.dump(window='-1')
         vc.findViewByIdOrRaise("android:id/progress")
     except ViewNotFoundException:
         finished = True
         pass
+    except RuntimeError as e:
+        print e
 print "benchmark finished"
 
 time.sleep(3)
@@ -37,14 +46,8 @@ time.sleep(1)
 device.drag((1000,300), (300,300), 500)
 time.sleep(1)
 vc.dump(window='-1')
-total_score = vc.findViewByIdOrRaise("id/no_id/15")
-integer_score = vc.findViewByIdOrRaise("id/no_id/14")
-floating_score = vc.findViewByIdOrRaise("id/no_id/18")
-memory_score = vc.findViewByIdOrRaise("id/no_id/21")
-stream_score = vc.findViewByIdOrRaise("id/no_id/24")
-
-call(['lava-test-case', '"Geekbench Total Score"', '--result pass', '--measurement', total_score.getContentDescription()])
-call(['lava-test-case', '"Geekbench Integer Score"', '--result pass', '--measurement', integer_score.getContentDescription()])
-call(['lava-test-case', '"Geekbench Floating Point Score"', '--result pass', '--measurement', floating_score.getContentDescription()])
-call(['lava-test-case', '"Geekbench Memory Score"', '--result pass', '--measurement', memory_score.getContentDescription()])
-call(['lava-test-case', '"Geekbench Stream Score"', '--result pass', '--measurement', stream_score.getContentDescription()])
+get_score_with_content_desc(vc, "Geekbench Score", 4)
+get_score_with_content_desc(vc, "Integer")
+get_score_with_content_desc(vc, "Floating Point")
+get_score_with_content_desc(vc, "Memory")
+get_score_with_content_desc(vc, "Stream")
diff --git a/linpack/vc.py b/linpack/vc.py
index d4f9c1d..53507d3 100644
--- a/linpack/vc.py
+++ b/linpack/vc.py
@@ -20,8 +20,8 @@ vc.dump(window='-1')
 mflops_single_score = vc.findViewByIdOrRaise("com.greenecomputing.linpack:id/txtmflops_result")
 time_single_score = vc.findViewByIdOrRaise("com.greenecomputing.linpack:id/txttime_result")
 
-call(['lava-test-case', '"Linpack MFLOPS Single Score"', '--result pass', '--measurement', mflops_single_score.getText(), '--units MFLOPS'])
-call(['lava-test-case', '"Linpack Time Single Score"', '--result pass', '--measurement', time_single_score.getText(), '--units seconds'])
+call(['lava-test-case', '"Linpack MFLOPS Single Score"', '--result', 'pass', '--measurement', mflops_single_score.getText(), '--units', 'MFLOPS'])
+call(['lava-test-case', '"Linpack Time Single Score"', '--result', 'pass', '--measurement', time_single_score.getText(), '--units', 'seconds'])
 
 start_multi_button = vc.findViewByIdOrRaise("com.greenecomputing.linpack:id/btncalculate")
 start_multi_button.touch()
@@ -30,5 +30,5 @@ vc.dump(window='-1')
 mflops_multi_score = vc.findViewByIdOrRaise("com.greenecomputing.linpack:id/txtmflops_result")
 time_multi_score = vc.findViewByIdOrRaise("com.greenecomputing.linpack:id/txttime_result")
 
-call(['lava-test-case', '"Linpack MFLOPS Multi Score"', '--result pass', '--measurement', mflops_multi_score.getText(), '--units MFLOPS'])
-call(['lava-test-case', '"Linpack Time Multi Score"', '--result pass', '--measurement', time_multi_score.getText(), '--units seconds'])
+call(['lava-test-case', '"Linpack MFLOPS Multi Score"', '--result', 'pass', '--measurement', mflops_multi_score.getText(), '--units', 'MFLOPS'])
+call(['lava-test-case', '"Linpack Time Multi Score"', '--result', 'pass', '--measurement', time_multi_score.getText(), '--units', 'seconds'])
diff --git a/nbench/vc.py b/nbench/vc.py
index cdcc8f9..4b74906 100644
--- a/nbench/vc.py
+++ b/nbench/vc.py
@@ -34,9 +34,9 @@ integer_score = vc.findViewByIdOrRaise("com.drolez.nbench:id/TextView02v")
 floating_score = vc.findViewByIdOrRaise("com.drolez.nbench:id/TextView03v")
 results = vc.findViewByIdOrRaise("com.drolez.nbench:id/editor")
 
-call(['lava-test-case', '"Nbench memory score"', '--result pass', '--measurement', memory_score.getText()])
-call(['lava-test-case', '"Nbench integer score"', '--result pass', '--measurement', integer_score.getText()])
-call(['lava-test-case', '"Nbench floating point score"', '--result pass', '--measurement', floating_score.getText()])
+call(['lava-test-case', 'Nbench memory score', '--result', 'pass', '--measurement', memory_score.getText()])
+call(['lava-test-case', 'Nbench integer score', '--result', 'pass', '--measurement', integer_score.getText()])
+call(['lava-test-case', 'Nbench floating point score', '--result', 'pass', '--measurement', floating_score.getText()])
 test_ids = ['NUMERIC SORT',
             'STRING SORT',
             'BITFIELD',
@@ -51,4 +51,4 @@ test_ids = ['NUMERIC SORT',
 results_re = re.compile("^(?P<test_case_id>[A-Z\s]+)\s+:\s+(?P<measurement>[\d\.e\+]+)", re.MULTILINE)
 for result in results_re.finditer(results.getText()):
     if result.group('test_case_id').strip() in test_ids:
-        call(['lava-test-case', result.group('test_case_id').strip(), '--result pass', '--measurement', result.group('measurement'), '--units Iterations/sec'])
+        call(['lava-test-case', result.group('test_case_id').strip(), '--result', 'pass', '--measurement', result.group('measurement'), '--units', 'Iterations/sec'])