Handle DOS line endings.

[apitrace-tests] / tracematch.py

diff --git a/tracematch.py b/tracematch.py
index 41320c17f27112fa7c6f9d6e091a4c08720cf328..9ffd310880323763b0c7705712cdd8dd1ad0ea71 100755 (executable)
--- a/tracematch.py
+++ b/tracematch.py
@@ -784,8 +784,8 @@ def main():
         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')