Merge lp://qastaging/~liuyq0307/lava-android-test/v8-skia into lp://qastaging/lava-android-test

Proposed by Yongqin Liu
Status: Merged
Merged at revision: 231
Proposed branch: lp://qastaging/~liuyq0307/lava-android-test/v8-skia
Merge into: lp://qastaging/lava-android-test
Diff against target: 122 lines (+40/-14)
4 files modified
lava_android_test/test_definitions/0xbench.py (+8/-5)
lava_android_test/test_definitions/android-0xbenchmark/android_0xbenchmark_wait.py (+18/-4)
lava_android_test/test_definitions/skia.py (+7/-4)
lava_android_test/test_definitions/v8.py (+7/-1)
To merge this branch: bzr merge lp://qastaging/~liuyq0307/lava-android-test/v8-skia
Reviewer Review Type Date Requested Status
Andy Doan (community) Approve
Review via email: mp+144221@code.qastaging.launchpad.net

Description of the change

update v8 and skia test

v8: change to use d8 command in case there is no v8shell command.
    because the v8shell command is change to d8 form JB version

skia: add option for the time parameter, so that we can pass this number
    from android build page to make it not spend too much time

To post a comment you must log in.
233. By Yongqin Liu

update 0xbench to accept specified option from android-build page

1. test to be run can be specified as "--ez <test> true", where "<test>"
   can be math/2d/3d/vm/native
2. the time for waiting finish can be specified from android-build
   as option like "-t 3600", but this must be specified with the test to be run,
   otherwise there will be no test to run automatically

234. By Yongqin Liu

fix the problem of timeout option -t

1. -t is accepted by am start command, so we changed to use -timeout
2. pass the $OPTIONS to android_0xbenchmark_wait.py

Revision history for this message
Yongqin Liu (liuyq0307) wrote :

Also add modification for 0xbench test:

update 0xbench to accept specified option from android-build page

1. test to be run can be specified as "--ez <test> true", where "<test>"
   can be math/2d/3d/vm/native
2. the time for waiting finish can be specified from android-build
   as option like "-timeout 3600", but this must be specified with the test to be run,
   otherwise there will be no test to run automatically

235. By Yongqin Liu

adjust --ez autorun true to the begin of the am comand

Revision history for this message
Andy Doan (doanac) wrote :

v8.py has:

154 -ADB_SHELL_STEPS = ['"cd /data/benchmark/v8; v8shell run.js"']
155 +adb_shell = ('"'
156 + 'cd /data/benchmark/v8;'
157 + 'if which v8shell 2>/dev/null 1>/dev/null;'
158 + 'then v8shell run.js; '
159 + 'else d8 run.js; fi'
160 + '"')
161 +ADB_SHELL_STEPS = [adb_shell]

that's a little awkward, since shell steps can be an array this could be broken up into multiple strings

Revision history for this message
Yongqin Liu (liuyq0307) wrote :

> v8.py has:
>
> 154 -ADB_SHELL_STEPS = ['"cd /data/benchmark/v8; v8shell run.js"']
> 155 +adb_shell = ('"'
> 156 + 'cd /data/benchmark/v8;'
> 157 + 'if which v8shell 2>/dev/null 1>/dev/null;'
> 158 + 'then v8shell run.js; '
> 159 + 'else d8 run.js; fi'
> 160 + '"')
> 161 +ADB_SHELL_STEPS = [adb_shell]
>
> that's a little awkward,
Yes, I know this is not good.
but we need all the shell steps in one string.
then we can run it as adb shell "shell steps".
if we change it to ADB_SHELL_STEPS = [steps1, steps2,..], this will not work.

> since shell steps can be an array this could be
> broken up into multiple strings
sorry, not understand clearly here.
in which case it will be broken up?

236. By Yongqin Liu

revert the change on lava_android_test/provider.py

Revision history for this message
Andy Doan (doanac) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches