diff options
| author | Senthil Kumaran <senthil.kumaran@linaro.org> | 2013-02-05 14:25:23 +0530 |
|---|---|---|
| committer | Senthil Kumaran <senthil.kumaran@linaro.org> | 2013-02-05 14:25:23 +0530 |
| commit | ca29deb2ec1449a03a44498f4db3dba05eb7d2c0 (patch) | |
| tree | 12f81570e7fe48b964e615238685b7f4763ec30f /android | |
| parent | 6dd0f27f05ae9401a4fc6dab2ff8ec01357d2f71 (diff) | |
Make glmark2 test definition to work.
Diffstat (limited to 'android')
| -rw-r--r-- | android/glmark2.yaml | 4 | ||||
| -rwxr-xr-x | android/scripts/glmark2/glmark2.sh | 14 |
2 files changed, 7 insertions, 11 deletions
diff --git a/android/glmark2.yaml b/android/glmark2.yaml index 821182b..70b7ac4 100644 --- a/android/glmark2.yaml +++ b/android/glmark2.yaml @@ -8,8 +8,8 @@ install: run: steps: - - "cd test-definitions/android/scripts/glmark2" - - "/bin/bash ./glmark2.sh $(SERIAL)" + - "cd test-definitions/android/scripts" + - ./glmark2/glmark2.sh parse: pattern: "^\\s*I/glmark2\\s*\\(.+\\):\\s+(?P<test_case_id>\\[\\w+\\]\\s+\\S+)\\s+FPS: diff --git a/android/scripts/glmark2/glmark2.sh b/android/scripts/glmark2/glmark2.sh index 8b02068..d297d02 100755 --- a/android/scripts/glmark2/glmark2.sh +++ b/android/scripts/glmark2/glmark2.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/system/bin/sh # # glmark2 test. # @@ -21,11 +21,7 @@ # Author: Senthil Kumaran <senthil.kumaran@linaro.org> # -function main(){ - logcat -c - shell am start -W org.linaro.glmark2/.Glmark2Activity - python ./glmark2_wait.py - logcat -d -} - -main "$@" +logcat -c +am start -W org.linaro.glmark2/.Glmark2Activity +./glmark2/glmark2_wait.py +logcat -d |