run-tests.py: improved output when test failed

Author: firewave

run-tests.py

@@ -6,7 +6,7 @@
 
 def cleanup(out):
   ret = ''
-  for s in out.decode('utf-8').split('\n'):
+  for s in out.decode('utf-8').splitlines():
     if len(s) > 1 and s[0] == '#':
       continue
     s = "".join(s.split())
@@ -93,30 +93,45 @@ 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
   simplecpp_cmd.extend(cmd.replace('-E ', '', 1).split(' '))
   p = subprocess.Popen(simplecpp_cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
   comm = p.communicate()
   simplecpp_ec = p.returncode
-  simplecpp_output = cleanup(comm[0])
+  simplecpp_output = comm[0]
+  simplecpp_output_c = cleanup(comm[0])
   simplecpp_err = comm[0].decode('utf-8').strip()
 
-  if simplecpp_output != clang_output and simplecpp_output != gcc_output:
+  if simplecpp_output_c != clang_output_c and simplecpp_output_c != gcc_output_c:
     filename = cmd[cmd.rfind('/')+1:]
     if filename in todo:
       print('TODO ' + cmd)
       usedTodos.append(filename)
     else:
       print('FAILED ' + cmd)
+      print('---expected (clang):')
+      print(clang_output_c)
+      print('---expected (gcc):')
+      print(gcc_output_c)
+      print('---actual:')
+      print(simplecpp_output_c)
+      print('---actual:')
+      print(simplecpp_output)
+      print('---original (clang):')
+      print(clang_output)
+      print('---original (gcc):')
+      print(gcc_output)
       if simplecpp_ec:
           print('simplecpp failed - ' + simplecpp_err)
       numberOfFailed = numberOfFailed + 1