diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2018-05-18 16:02:22 +0000 |
|---|---|---|
| committer | android-build-prod (mdb) <android-build-team-robot@google.com> | 2018-05-18 16:02:22 +0000 |
| commit | fb6c7de96a845fed505f071c840d2e1c7bfaec30 (patch) | |
| tree | 1bb3e2750f7df3595a9c9bd92127194a6aece1c0 | |
| parent | 9660c1ad36cc1198cbdc49f567b6852b193eb7dc (diff) | |
| parent | 1908cf597e7f5a3da3952e0cdb0a48c98e77bbc4 (diff) | |
| download | kernel-fb6c7de96a845fed505f071c840d2e1c7bfaec30.tar.gz | |
Snap for 4788939 from 1908cf597e7f5a3da3952e0cdb0a48c98e77bbc4 to oreo-mr1-vts-releaseandroid-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10
Change-Id: I427e948e440ee9c9dfb0de229cdd2c0a4361a537
| -rw-r--r-- | api/proc/ProcZoneInfoTest.py | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/api/proc/ProcZoneInfoTest.py b/api/proc/ProcZoneInfoTest.py index b8b7cbae..4062f374 100644 --- a/api/proc/ProcZoneInfoTest.py +++ b/api/proc/ProcZoneInfoTest.py @@ -36,7 +36,7 @@ class ProcZoneInfoTest(KernelProcFileTestBase.KernelProcFileTestBase): t_ignore = ' ' - start = 'nodes' + start = 'newnode' p_nodes = repeat_rule('node') p_lines = repeat_rule('line') @@ -44,9 +44,22 @@ class ProcZoneInfoTest(KernelProcFileTestBase.KernelProcFileTestBase): p_colonlines = repeat_rule('colonline') p_numcommas = repeat_rule('numcomma') + def p_newnode(self, p): + 'newnode : nodes unpopulated' + p[0] = p[1:] + def p_node(self, p): - 'node : heading pernode APAGES lines protection PAGESETS NEWLINE cpus colonlines' - p[0] = [p[1], p[3], p[4], p[7], p[8]] + '''node : heading pernode APAGES lines protection PAGESETS NEWLINE cpus colonlines + | heading pernode APAGES lines protection lines PAGESETS NEWLINE cpus colonlines''' + if len(p) == 11: + p[0] = [p[1], p[3], p[4] + p[6], p[8], p[9]] + else: + p[0] = [p[1], p[3], p[4], p[7], p[8]] + + def p_unpopulated(self, p): + '''unpopulated : heading pernode APAGES lines protection + | empty''' + p[0] = [] if len(p) == 2 else [p[1], p[3], p[4]] def p_pernode(self, p): '''pernode : PERNODE STATS NEWLINE lines |