Handle DOS line endings.

diff --git a/app_driver.py b/app_driver.py
index a7f83e89845714a09f7ea49dcc886095154587ab..51f89b6a836e04aa166b4d180aafcded22c6b9a3 100755 (executable)
--- a/app_driver.py
+++ b/app_driver.py
@@ -173,8 +173,8 @@ class AppDriver(Driver):
     def checkTrace(self):
         sys.stderr.write('Comparing trace %s against %s...\n' % (self.trace_file, self.ref_dump))
 
-        cmd = [options.apitrace, 'dump', '--color=never', self.trace_file]
-        p = popen(cmd, stdout=subprocess.PIPE)
+        cmd = [options.apitrace, 'dump', '--verbose', '--color=never', self.trace_file]
+        p = popen(cmd, stdout=subprocess.PIPE, universal_newlines=True)
 
         srcParser = SrcTraceParser(p.stdout)
         srcTrace = srcParser.parse()

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')