commit da362e9fa9df8d4f6b434e5f00c5e9e23927ec99
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Mon Jun 03 09:09:21 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 03 09:09:21 2024 +0000
tree e61bacb7bf46904a6fb6004b92d69486dc3473a8
parent d7f526fd05a9514634c2cfdf6d549fd6b85130da
parent 39507ae44ee07eabaee9b0c22c13f245c66d6518

Merge "Improve CIL parsing" into main

private/compat/202404/202404.cil

diff --git a/private/compat/202404/202404.cil b/private/compat/202404/202404.cil
index b93b56a..869deb6 100644
--- a/private/compat/202404/202404.cil
+++ b/private/compat/202404/202404.cil
@@ -1,5 +1,5 @@
-;; This type may or may not already exist in vendor policy. Re-define it here - duplicate
-;; definitions in CIL will be ignored - so we can reference it in 202404.cil.
+;; This type may or may not already exist in vendor policy. Re-define it here (duplicate
+;; definitions in CIL will be ignored) - so we can reference it in 202404.cil.
 (type vendor_hidraw_device)
 (typeattributeset dev_type (vendor_hidraw_device))
 

tests/mini_parser.py

diff --git a/tests/mini_parser.py b/tests/mini_parser.py
index 25018a7..88a1998 100644
--- a/tests/mini_parser.py
+++ b/tests/mini_parser.py
@@ -71,7 +71,13 @@
         s = ""
         c = infile.read(1)
         # get to first statement
-        while c and c != "(":
+        while c:
+            if c == ';':
+                # comment, get rid of rest of the line
+                while c != '\n':
+                    c = infile.read(1)
+            elif c == '(':
+                break
             c = infile.read(1)
 
         parens += 1