tests

Author: firewave

run-tests.py

@@ -93,13 +93,15 @@ def cleanup(out):
   clang_cmd.extend(cmd.split(' '))
   p = subprocess.Popen(clang_cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
   comm = p.communicate()
-  clang_output = cleanup(comm[0])
+  clang_output = comm[0]
+  clang_output_c = cleanup(comm[0])
 
   gcc_cmd = ['gcc']
   gcc_cmd.extend(cmd.split(' '))
   p = subprocess.Popen(gcc_cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
   comm = p.communicate()
-  gcc_output = cleanup(comm[0])
+  gcc_output = comm[0]
+  gcc_output_c = cleanup(comm[0])
 
   simplecpp_cmd = ['./simplecpp']
   # -E is not supported and we bail out on unknown options
@@ -110,17 +112,19 @@ def cleanup(out):
   simplecpp_output = cleanup(comm[0])
   simplecpp_err = comm[0].decode('utf-8').strip()
 
-  if simplecpp_output != clang_output and simplecpp_output != gcc_output:
+  if simplecpp_output != clang_output_c and simplecpp_output != gcc_output_c:
     filename = cmd[cmd.rfind('/')+1:]
     if filename in todo:
       print('TODO ' + cmd)
       usedTodos.append(filename)
     else:
       print('FAILED ' + cmd)
-      print('expected:')
-      print(clang_output)
-      print('actual:')
+      print('---expected:')
+      print(clang_output_c)
+      print('---actual:')
       print(simplecpp_output)
+      print('---original:')
+      print(clang_output)
       if simplecpp_ec:
           print('simplecpp failed - ' + simplecpp_err)
       numberOfFailed = numberOfFailed + 1