Accept comments in reference traces.

[apitrace-tests] / tracematch.py

diff --git a/tracematch.py b/tracematch.py
index 41320c17f27112fa7c6f9d6e091a4c08720cf328..c1e0948210e8405ba8fdcca6ef3dc1a8680429f2 100755 (executable)
--- a/tracematch.py
+++ b/tracematch.py
@@ -440,6 +440,9 @@ class CallScanner(Scanner):
         # whitespace
         (SKIP, r'[ \t\f\r\n\v]+', False),
 
         # whitespace
         (SKIP, r'[ \t\f\r\n\v]+', False),
 

+        # comments
+        (SKIP, r'//[^\r\n]*', False),
+

         # Alphanumeric IDs
         (ID, r'[a-zA-Z_][a-zA-Z0-9_]*(?:::[a-zA-Z_][a-zA-Z0-9_]*)?', True),
 
         # Alphanumeric IDs
         (ID, r'[a-zA-Z_][a-zA-Z0-9_]*(?:::[a-zA-Z_][a-zA-Z0-9_]*)?', True),
 


@@ -784,8 +787,8 @@ def main():
         sys.stdout.write('\n')
 
     if srcFileName.endswith('.trace'):
         sys.stdout.write('\n')
 
     if srcFileName.endswith('.trace'):

-        cmd = [options.apitrace, 'dump', '--color=never', srcFileName]
-        p = subprocess.Popen(cmd, stdout=subprocess.PIPE)
+        cmd = [options.apitrace, 'dump', '--verbose', '--color=never', srcFileName]
+        p = subprocess.Popen(cmd, stdout=subprocess.PIPE, universal_newlines=True)

         srcStream = p.stdout
     else:
         srcStream = open(srcFileName, 'rt')
         srcStream = p.stdout
     else:
         srcStream = open(srcFileName, 'rt')