summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenneth Magic <kmagic@google.com>2018-07-16 23:51:44 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2018-07-16 23:51:44 +0000
commitcaefec637baa7268e3c8c3eafc41d14ed072737e (patch)
tree96e3c6e1c269c23b0a17402965927b8b05f5e9b9
parente95f3fdf50b1bb46627c5b3f42bb338945ac5746 (diff)
parent07c89446bde3a0c5a686b4b5df72181a0046de52 (diff)
downloadplatform_test_vts-testcase_kernel-pie-dr1-dev.tar.gz
platform_test_vts-testcase_kernel-pie-dr1-dev.tar.bz2
platform_test_vts-testcase_kernel-pie-dr1-dev.zip
Merge "Update to allow more flexible descriptions." into pi-devpie-dr1-dev
-rw-r--r--api/proc/ProcAsoundTests.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/api/proc/ProcAsoundTests.py b/api/proc/ProcAsoundTests.py
index 6e1ec268..a6422bb6 100644
--- a/api/proc/ProcAsoundTests.py
+++ b/api/proc/ProcAsoundTests.py
@@ -40,11 +40,12 @@ class ProcAsoundCardsTest(KernelProcFileTestBase.KernelProcFileTestBase):
def p_description(self, p):
'''description : description word
| word'''
- p[0] = [p[1]] if len(p) == 2 else p[1].append(p[2])
+ p[0] = [p[1]] if len(p) == 2 else p[1] + [p[2]]
def p_word(self, p):
'''word : NUMBER
- | STRING'''
+ | STRING
+ | HEX_LITERAL'''
p[0] = p[1]
def p_id(self, p):