LAVA Android Test

Merge lp:~afrantzis/lava-android-test/update-glmark2-pattern into lp:lava-android-test

  1. update-glmark2-pattern
  2. Merge into trunk
Proposed by Alexandros Frantzis
Status: Merged
Merged at revision: 179
Proposed branch: lp:~afrantzis/lava-android-test/update-glmark2-pattern
Merge into: lp:lava-android-test
Diff against target: 16 lines (+3/-3)
1 file modified
lava_android_test/test_definitions/glmark2.py (+3/-3)
To merge this branch: bzr merge lp:~afrantzis/lava-android-test/update-glmark2-pattern
Reviewer Review Type Date Requested Status
Andy Doan (community) Approve
Review via email: mp+112382@code.launchpad.net

Description of the change

glmark2: Update regexp pattern.

This commit changes the regexp pattern in two ways. First, it includes the
scene name (the part in square brackets) in the test_case_id. Second,
it removes the EOL ('$') match to make the regexp more tolerant of changes
in the output format, in this case the addition of "FrameTime" after "FPS".

To post a comment you must log in.
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
1=== modified file 'lava_android_test/test_definitions/glmark2.py'
2--- lava_android_test/test_definitions/glmark2.py 2012-06-25 17:23:05 +0000
3+++ lava_android_test/test_definitions/glmark2.py 2012-06-27 15:34:32 +0000
4@@ -37,9 +37,9 @@
5 test_sh_path = os.path.join(curdir, test_name, test_sh_name)
6 RUN_STEPS_HOST_PRE = ['/bin/bash %s $(SERIAL)' % test_sh_path]
7
8-#I/glmark2 ( 1818): [texture] texture-filter=nearest: FPS: 8
9-PATTERN = ("^\s*I/glmark2\s*\(.+\):\s+\[\w+\]\s+(?P<test_case_id>\S+):"
10- "\s+FPS:\s+(?P<measurement>\d+)\s*$")
11+#I/glmark2 ( 1818): [texture] texture-filter=nearest: FPS: 8 FrameTime: 125.000 ms
12+PATTERN = ("^\s*I/glmark2\s*\(.+\):\s+(?P<test_case_id>\[\w+\]\s+\S+)"
13+ "\s+FPS:\s+(?P<measurement>\d+)")
14
15 inst = lava_android_test.testdef.AndroidTestInstaller()
16 run = lava_android_test.testdef.AndroidTestRunner(

Subscribers

People subscribed via source and target branches